diff --git a/imageapi_optimize_binaries.services.yml b/imageapi_optimize_binaries.services.yml
index 824238fa799c8581331ce30050b9f5913e4a382c..eb10844cd6a5c339911ed86e365334913c25c93f 100644
--- a/imageapi_optimize_binaries.services.yml
+++ b/imageapi_optimize_binaries.services.yml
@@ -1,3 +1,3 @@
 services:
-  imageapi_optimize.shell_operations:
-    class: Drupal\imageapi_optimize\ShellOperations
+  imageapi_optimize_binaries.shell_operations:
+    class: Drupal\imageapi_optimize_binaries\ShellOperations
diff --git a/src/ImageAPIOptimizeProcessorBinaryBase.php b/src/ImageAPIOptimizeProcessorBinaryBase.php
index 3a5e11747f6df62ff596e8d288187316d276b34a..8009fb3e6f42b76c2da1341c19402b13d3cff956 100644
--- a/src/ImageAPIOptimizeProcessorBinaryBase.php
+++ b/src/ImageAPIOptimizeProcessorBinaryBase.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Drupal\imageapi_optimize;
+namespace Drupal\imageapi_optimize_binaries;
 
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Image\ImageFactory;
+use Drupal\imageapi_optimize\ConfigurableImageAPIOptimizeProcessorBase;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -23,7 +24,7 @@ abstract class ImageAPIOptimizeProcessorBinaryBase extends ConfigurableImageAPIO
   /**
    * The imageapi shell operation service.
    *
-   * @var \Drupal\imageapi_optimize\ImageAPIOptimizeShellOperationsInterface
+   * @var \Drupal\imageapi_optimize_binaries\ImageAPIOptimizeShellOperationsInterface
    */
   protected $shellOperations;
 
@@ -48,7 +49,7 @@ abstract class ImageAPIOptimizeProcessorBinaryBase extends ConfigurableImageAPIO
       $container->get('logger.factory')->get('imageapi_optimize'),
       $container->get('image.factory'),
       $container->get('file_system'),
-      $container->get('imageapi_optimize.shell_operations')
+      $container->get('imageapi_optimize_binaries.shell_operations')
     );
   }
 
diff --git a/src/ImageAPIOptimizeShellOperationsInterface.php b/src/ImageAPIOptimizeShellOperationsInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..bbfdd8b7c7eab30e5a70dfd7c1e515e95d90515d
--- /dev/null
+++ b/src/ImageAPIOptimizeShellOperationsInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Drupal\imageapi_optimize_binaries;
+
+interface ImageAPIOptimizeShellOperationsInterface {
+  public function findExecutablePath($executable = NULL);
+  public function execShellCommand($command, $options, $arguments);
+  public function saveCommandStdoutToFile($cmd, $dst);
+}
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/AdvDef.php b/src/Plugin/ImageAPIOptimizeProcessor/AdvDef.php
index 43c54c7a8048bc12d5d94ed8c9de0693f4ad753f..751e449428b6f60f560d2ac4263030acc720178a 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/AdvDef.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/AdvDef.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the AdvDef binary to optimize images.
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/AdvPng.php b/src/Plugin/ImageAPIOptimizeProcessor/AdvPng.php
index bdba1b594e56dbe0e51fa20f59ae4a4db60bb2e9..e33c7d4abd7180d7e066d0eafea62e5ca8444620 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/AdvPng.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/AdvPng.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the AdvPng binary to optimize images.
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/JfifRemove.php b/src/Plugin/ImageAPIOptimizeProcessor/JfifRemove.php
index 7fa9421099f7f1055303da4fe1eaeb8ddb1160f2..04ffd3d0cb64df42f1bcba63d6821ea9f76c1097 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/JfifRemove.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/JfifRemove.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the JfifRemove binary to optimize images.
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/JpegOptim.php b/src/Plugin/ImageAPIOptimizeProcessor/JpegOptim.php
index 65eee8aa9ed3e945f2850e16337dbe1da10b70d4..316979d86e7c4e2e368bbd61e8288a5dda8bf951 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/JpegOptim.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/JpegOptim.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the JpegOptim binary to optimize images.
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/JpegTran.php b/src/Plugin/ImageAPIOptimizeProcessor/JpegTran.php
index ea44c79f61833fb79ae99fdb35fb408c61bdb424..b51abc60b7bb60030a264d17a4614ff2f72a22cb 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/JpegTran.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/JpegTran.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the JpegTran binary to optimize images.
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/OptiPng.php b/src/Plugin/ImageAPIOptimizeProcessor/OptiPng.php
index cb4127ba28d3baa2b958680a93e4961c69ef8f50..2810656a2658feade7b347b325267869d248dbfd 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/OptiPng.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/OptiPng.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the OptiPng binary to optimize images.
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/PngCrush.php b/src/Plugin/ImageAPIOptimizeProcessor/PngCrush.php
index 8c291ff6f0b19a0fb42c784bc27066d768d82c1a..2f86bc07903f253ace5d0515b7516691071d67ff 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/PngCrush.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/PngCrush.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the PngCrush binary to optimize images.
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/PngOut.php b/src/Plugin/ImageAPIOptimizeProcessor/PngOut.php
index 13cb200edb0b64b69afe033aa14e4f03d87ca4fe..132eccb59d20cce071eb5dbc297068eb1748da1e 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/PngOut.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/PngOut.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the PngOut binary to optimize images.
diff --git a/src/Plugin/ImageAPIOptimizeProcessor/PngQuant.php b/src/Plugin/ImageAPIOptimizeProcessor/PngQuant.php
index 30f9824a14c399d2146dc0a8338f7a45ce302b1f..d2a74d798a57232c299f362e61e6c2b92a0461a2 100644
--- a/src/Plugin/ImageAPIOptimizeProcessor/PngQuant.php
+++ b/src/Plugin/ImageAPIOptimizeProcessor/PngQuant.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor;
+namespace Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor;
 
-use Drupal\imageapi_optimize\ImageAPIOptimizeProcessorBinaryBase;
+use Drupal\imageapi_optimize_binaries\ImageAPIOptimizeProcessorBinaryBase;
 
 /**
  * Uses the PngQuant binary to optimize images.
diff --git a/src/ShellOperations.php b/src/ShellOperations.php
index ee398214905b2fd4f15bb70e28d779f0aa0a3805..1c45f0b864499beaeaecdedf5488d300d6a4e422 100644
--- a/src/ShellOperations.php
+++ b/src/ShellOperations.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\imageapi_optimize;
+namespace Drupal\imageapi_optimize_binaries;
 
 
 /**
diff --git a/tests/src/Unit/AdvDefTest.php b/tests/src/Unit/AdvDefTest.php
index 01c1b94c1f2cf1cec9008fd0b3b5ce5c1c435e7e..99b9533f6e4d88846adf69a2ee6cefa5d33f8dd3 100644
--- a/tests/src/Unit/AdvDefTest.php
+++ b/tests/src/Unit/AdvDefTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\imageapi_optimize\Unit;
 
-use Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor\AdvDef;
+use Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor\AdvDef;
 
 /**
  * Tests AdvDef image optimize plugin.
diff --git a/tests/src/Unit/AdvPngTest.php b/tests/src/Unit/AdvPngTest.php
index f7f91f8780c9589c8cd808e0ade760baed98a5d0..1642fb9d2be542e9218cc886ed691d00eebfc94b 100644
--- a/tests/src/Unit/AdvPngTest.php
+++ b/tests/src/Unit/AdvPngTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\imageapi_optimize\Unit;
 
-use Drupal\imageapi_optimize\Plugin\ImageAPIOptimizeProcessor\AdvPng;
+use Drupal\imageapi_optimize_binaries\Plugin\ImageAPIOptimizeProcessor\AdvPng;
 
 /**
  * Tests AdvPng image optimize plugin.
diff --git a/tests/src/Unit/BinaryTestCase.php b/tests/src/Unit/BinaryTestCase.php
index de775295e3e8d00bfa2577209f719243c112e1ad..b128b3185ceae6784f4f934b5db2006a4d536852 100644
--- a/tests/src/Unit/BinaryTestCase.php
+++ b/tests/src/Unit/BinaryTestCase.php
@@ -30,7 +30,7 @@ abstract class BinaryTestCase extends UnitTestCase {
   }
 
   protected function getShellOperationsMock() {
-    $shellOperationsMock =  $this->getMockBuilder('\Drupal\imageapi_optimize\ImageAPIOptimizeShellOperationsInterface')
+    $shellOperationsMock =  $this->getMockBuilder('\Drupal\imageapi_optimize_binaries\ImageAPIOptimizeShellOperationsInterface')
       ->setMethods(['findExecutablePath', 'execShellCommand', 'saveCommandStdoutToFile'])
       ->getMock();