diff --git a/src/Spout/Writer/CSV/Manager/OptionsManager.php b/src/Spout/Writer/CSV/Manager/OptionsManager.php
index 73a47c5..502ce94 100644
--- a/src/Spout/Writer/CSV/Manager/OptionsManager.php
+++ b/src/Spout/Writer/CSV/Manager/OptionsManager.php
@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\CSV\Manager;
 
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Manager\OptionsManagerAbstract;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Manager\OptionsManagerAbstract;
 
 /**
  * Class OptionsManager
diff --git a/src/Spout/Writer/CSV/Writer.php b/src/Spout/Writer/CSV/Writer.php
index 8a58efa..9740fd9 100644
--- a/src/Spout/Writer/CSV/Writer.php
+++ b/src/Spout/Writer/CSV/Writer.php
@@ -5,7 +5,7 @@ namespace Box\Spout\Writer\CSV;
 use Box\Spout\Writer\WriterAbstract;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\EncodingHelper;
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Options;
 
 /**
  * Class Writer
diff --git a/src/Spout/Writer/Creator/EntityFactory.php b/src/Spout/Writer/Common/Creator/EntityFactory.php
similarity index 74%
rename from src/Spout/Writer/Creator/EntityFactory.php
rename to src/Spout/Writer/Common/Creator/EntityFactory.php
index 6277179..44fdd35 100644
--- a/src/Spout/Writer/Creator/EntityFactory.php
+++ b/src/Spout/Writer/Common/Creator/EntityFactory.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Box\Spout\Writer\Creator;
+namespace Box\Spout\Writer\Common\Creator;
 
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Entity\Workbook;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Workbook;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 
 /**
  * Class EntityFactory
  * Factory to create entities
  *
- * @package Box\Spout\Writer\Creator
+ * @package Box\Spout\Writer\Common\Creator
  */
 class EntityFactory
 {
diff --git a/src/Spout/Writer/Creator/InternalFactoryInterface.php b/src/Spout/Writer/Common/Creator/InternalFactoryInterface.php
similarity index 57%
rename from src/Spout/Writer/Creator/InternalFactoryInterface.php
rename to src/Spout/Writer/Common/Creator/InternalFactoryInterface.php
index f4f3809..7d085bf 100644
--- a/src/Spout/Writer/Creator/InternalFactoryInterface.php
+++ b/src/Spout/Writer/Common/Creator/InternalFactoryInterface.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Box\Spout\Writer\Creator;
+namespace Box\Spout\Writer\Common\Creator;
 
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Manager\WorkbookManagerInterface;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Manager\WorkbookManagerInterface;
 
 /**
  * Interface GeneralFactoryInterface
  *
- * @package Box\Spout\Writer\Creator
+ * @package Box\Spout\Writer\Common\Creator
  */
 interface InternalFactoryInterface
 {
diff --git a/src/Spout/Writer/Entity/Cell.php b/src/Spout/Writer/Common/Entity/Cell.php
similarity index 97%
rename from src/Spout/Writer/Entity/Cell.php
rename to src/Spout/Writer/Common/Entity/Cell.php
index 230de6a..ab9f2ff 100644
--- a/src/Spout/Writer/Entity/Cell.php
+++ b/src/Spout/Writer/Common/Entity/Cell.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Box\Spout\Writer\Entity;
+namespace Box\Spout\Writer\Common\Entity;
 
 use Box\Spout\Writer\Common\Helper\CellHelper;
 
 /**
  * Class Cell
  *
- * @package Box\Spout\Writer\Entity
+ * @package Box\Spout\Writer\Common\Entity
  */
 class Cell
 {
diff --git a/src/Spout/Writer/Entity/Options.php b/src/Spout/Writer/Common/Entity/Options.php
similarity index 86%
rename from src/Spout/Writer/Entity/Options.php
rename to src/Spout/Writer/Common/Entity/Options.php
index 701b105..2641f72 100644
--- a/src/Spout/Writer/Entity/Options.php
+++ b/src/Spout/Writer/Common/Entity/Options.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Entity;
+namespace Box\Spout\Writer\Common\Entity;
 
 /**
  * Class Options
  * Writer' options holder
  *
- * @package Box\Spout\Writer\Entity
+ * @package Box\Spout\Writer\Common\Entity
  */
 abstract class Options
 {
diff --git a/src/Spout/Writer/Entity/Workbook.php b/src/Spout/Writer/Common/Entity/Workbook.php
similarity index 90%
rename from src/Spout/Writer/Entity/Workbook.php
rename to src/Spout/Writer/Common/Entity/Workbook.php
index 6a95d28..e10a419 100644
--- a/src/Spout/Writer/Entity/Workbook.php
+++ b/src/Spout/Writer/Common/Entity/Workbook.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Entity;
+namespace Box\Spout\Writer\Common\Entity;
 
 /**
  * Class Workbook
  * Entity describing a workbook
  *
- * @package Box\Spout\Writer\Entity
+ * @package Box\Spout\Writer\Common\Entity
  */
 class Workbook
 {
diff --git a/src/Spout/Writer/Entity/Worksheet.php b/src/Spout/Writer/Common/Entity/Worksheet.php
similarity index 96%
rename from src/Spout/Writer/Entity/Worksheet.php
rename to src/Spout/Writer/Common/Entity/Worksheet.php
index 58de5a5..9d0b9bb 100644
--- a/src/Spout/Writer/Entity/Worksheet.php
+++ b/src/Spout/Writer/Common/Entity/Worksheet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Box\Spout\Writer\Entity;
+namespace Box\Spout\Writer\Common\Entity;
 
 use Box\Spout\Writer\Common\Sheet;
 
@@ -8,7 +8,7 @@ use Box\Spout\Writer\Common\Sheet;
  * Class Worksheet
  * Entity describing a Worksheet
  *
- * @package Box\Spout\Writer\Entity
+ * @package Box\Spout\Writer\Common\Entity
  */
 class Worksheet
 {
diff --git a/src/Spout/Writer/Manager/OptionsManagerAbstract.php b/src/Spout/Writer/Common/Manager/OptionsManagerAbstract.php
similarity index 94%
rename from src/Spout/Writer/Manager/OptionsManagerAbstract.php
rename to src/Spout/Writer/Common/Manager/OptionsManagerAbstract.php
index e9adfb8..7b9e176 100644
--- a/src/Spout/Writer/Manager/OptionsManagerAbstract.php
+++ b/src/Spout/Writer/Common/Manager/OptionsManagerAbstract.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 /**
  * Class OptionsManager
  * Writer' options manager
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 abstract class OptionsManagerAbstract implements OptionsManagerInterface
 {
diff --git a/src/Spout/Writer/Manager/OptionsManagerInterface.php b/src/Spout/Writer/Common/Manager/OptionsManagerInterface.php
similarity index 84%
rename from src/Spout/Writer/Manager/OptionsManagerInterface.php
rename to src/Spout/Writer/Common/Manager/OptionsManagerInterface.php
index 8994120..80ac9b4 100644
--- a/src/Spout/Writer/Manager/OptionsManagerInterface.php
+++ b/src/Spout/Writer/Common/Manager/OptionsManagerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 /**
  * Interface OptionsManagerInterface
  * Writer' options interface
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 interface OptionsManagerInterface
 {
diff --git a/src/Spout/Writer/Manager/WorkbookManagerAbstract.php b/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php
similarity index 97%
rename from src/Spout/Writer/Manager/WorkbookManagerAbstract.php
rename to src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php
index c6b935f..050f673 100644
--- a/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
+++ b/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php
@@ -1,25 +1,24 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Writer\Common\Helper\FileSystemWithRootFolderHelperInterface;
 use Box\Spout\Writer\Common\Helper\StyleHelperInterface;
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Options;
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Entity\Workbook;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Workbook;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Exception\SheetNotFoundException;
 use Box\Spout\Writer\Exception\WriterException;
-use Box\Spout\Writer\Creator\EntityFactory;
+use Box\Spout\Writer\Common\Creator\EntityFactory;
 use Box\Spout\Writer\Style\Style;
 
 /**
  * Class WorkbookManagerAbstract
  * Abstract workbook manager, providing the generic interfaces to work with workbook.
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 abstract class WorkbookManagerAbstract implements WorkbookManagerInterface
 {
diff --git a/src/Spout/Writer/Manager/WorkbookManagerInterface.php b/src/Spout/Writer/Common/Manager/WorkbookManagerInterface.php
similarity index 93%
rename from src/Spout/Writer/Manager/WorkbookManagerInterface.php
rename to src/Spout/Writer/Common/Manager/WorkbookManagerInterface.php
index 2645991..e410004 100644
--- a/src/Spout/Writer/Manager/WorkbookManagerInterface.php
+++ b/src/Spout/Writer/Common/Manager/WorkbookManagerInterface.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Entity\Workbook;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Workbook;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Exception\SheetNotFoundException;
 use Box\Spout\Writer\Exception\WriterException;
 use Box\Spout\Writer\Style\Style;
@@ -14,7 +14,7 @@ use Box\Spout\Writer\Style\Style;
  * Interface WorkbookManagerInterface
  * workbook manager interface, providing the generic interfaces to work with workbook.
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 interface WorkbookManagerInterface
 {
diff --git a/src/Spout/Writer/Manager/WorksheetManagerInterface.php b/src/Spout/Writer/Common/Manager/WorksheetManagerInterface.php
similarity index 90%
rename from src/Spout/Writer/Manager/WorksheetManagerInterface.php
rename to src/Spout/Writer/Common/Manager/WorksheetManagerInterface.php
index 1b29d62..4904c84 100644
--- a/src/Spout/Writer/Manager/WorksheetManagerInterface.php
+++ b/src/Spout/Writer/Common/Manager/WorksheetManagerInterface.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Style\Style;
 
 /**
  * Interface WorksheetManagerInterface
  * Inteface for worksheet managers, providing the generic interfaces to work with worksheets.
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 interface WorksheetManagerInterface
 {
diff --git a/src/Spout/Writer/ODS/Creator/InternalFactory.php b/src/Spout/Writer/ODS/Creator/InternalFactory.php
index 1e455d4..a2adb05 100644
--- a/src/Spout/Writer/ODS/Creator/InternalFactory.php
+++ b/src/Spout/Writer/ODS/Creator/InternalFactory.php
@@ -3,10 +3,10 @@
 namespace Box\Spout\Writer\ODS\Creator;
 
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Creator\EntityFactory;
-use Box\Spout\Writer\Creator\InternalFactoryInterface;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Creator\EntityFactory;
+use Box\Spout\Writer\Common\Creator\InternalFactoryInterface;
 use Box\Spout\Writer\ODS\Helper\FileSystemHelper;
 use Box\Spout\Writer\ODS\Helper\StyleHelper;
 use Box\Spout\Writer\ODS\Manager\WorkbookManager;
diff --git a/src/Spout/Writer/ODS/Helper/FileSystemHelper.php b/src/Spout/Writer/ODS/Helper/FileSystemHelper.php
index 4603465..89bc5a4 100644
--- a/src/Spout/Writer/ODS/Helper/FileSystemHelper.php
+++ b/src/Spout/Writer/ODS/Helper/FileSystemHelper.php
@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\ODS\Helper;
 
 use Box\Spout\Writer\Common\Helper\FileSystemWithRootFolderHelperInterface;
 use Box\Spout\Writer\Common\Helper\ZipHelper;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\ODS\Manager\WorksheetManager;
 
 /**
diff --git a/src/Spout/Writer/ODS/Manager/OptionsManager.php b/src/Spout/Writer/ODS/Manager/OptionsManager.php
index c395e81..20d42d7 100644
--- a/src/Spout/Writer/ODS/Manager/OptionsManager.php
+++ b/src/Spout/Writer/ODS/Manager/OptionsManager.php
@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\ODS\Manager;
 
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Manager\OptionsManagerAbstract;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Manager\OptionsManagerAbstract;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**
diff --git a/src/Spout/Writer/ODS/Manager/WorkbookManager.php b/src/Spout/Writer/ODS/Manager/WorkbookManager.php
index 0e0efbd..19330d4 100644
--- a/src/Spout/Writer/ODS/Manager/WorkbookManager.php
+++ b/src/Spout/Writer/ODS/Manager/WorkbookManager.php
@@ -3,7 +3,7 @@
 namespace Box\Spout\Writer\ODS\Manager;
 
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Manager\WorkbookManagerAbstract;
+use Box\Spout\Writer\Common\Manager\WorkbookManagerAbstract;
 use Box\Spout\Writer\ODS\Helper\FileSystemHelper;
 use Box\Spout\Writer\ODS\Helper\StyleHelper;
 
diff --git a/src/Spout/Writer/ODS/Manager/WorksheetManager.php b/src/Spout/Writer/ODS/Manager/WorksheetManager.php
index b79f843..016336b 100644
--- a/src/Spout/Writer/ODS/Manager/WorksheetManager.php
+++ b/src/Spout/Writer/ODS/Manager/WorksheetManager.php
@@ -5,9 +5,9 @@ namespace Box\Spout\Writer\ODS\Manager;
 use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Entity\Cell;
-use Box\Spout\Writer\Entity\Worksheet;
-use Box\Spout\Writer\Manager\WorksheetManagerInterface;
+use Box\Spout\Writer\Common\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Worksheet;
+use Box\Spout\Writer\Common\Manager\WorksheetManagerInterface;
 use Box\Spout\Writer\ODS\Helper\StyleHelper;
 use Box\Spout\Writer\Style\Style;
 
diff --git a/src/Spout/Writer/ODS/Writer.php b/src/Spout/Writer/ODS/Writer.php
index 2a5f78c..e753c79 100644
--- a/src/Spout/Writer/ODS/Writer.php
+++ b/src/Spout/Writer/ODS/Writer.php
@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\ODS;
 
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Options;
 use Box\Spout\Writer\WriterMultiSheetsAbstract;
 
 /**
diff --git a/src/Spout/Writer/WriterAbstract.php b/src/Spout/Writer/WriterAbstract.php
index 4713dfb..1425406 100644
--- a/src/Spout/Writer/WriterAbstract.php
+++ b/src/Spout/Writer/WriterAbstract.php
@@ -6,8 +6,8 @@ use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Exception\SpoutException;
 use Box\Spout\Common\Helper\FileSystemHelper;
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
 use Box\Spout\Writer\Exception\WriterAlreadyOpenedException;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
 
@@ -31,7 +31,7 @@ abstract class WriterAbstract implements WriterInterface
     /** @var \Box\Spout\Common\Helper\GlobalFunctionsHelper Helper to work with global functions */
     protected $globalFunctionsHelper;
 
-    /** @var \Box\Spout\Writer\Manager\OptionsManagerInterface Writer options manager */
+    /** @var \Box\Spout\Writer\Common\Manager\OptionsManagerInterface Writer options manager */
     protected $optionsManager;
 
     /** @var Style\Style Style to be applied to the next written row(s) */
@@ -66,7 +66,7 @@ abstract class WriterAbstract implements WriterInterface
     abstract protected function closeWriter();
 
     /**
-     * @param \Box\Spout\Writer\Manager\OptionsManagerInterface $optionsManager
+     * @param \Box\Spout\Writer\Common\Manager\OptionsManagerInterface $optionsManager
      */
     public function __construct(OptionsManagerInterface $optionsManager)
     {
diff --git a/src/Spout/Writer/WriterFactory.php b/src/Spout/Writer/WriterFactory.php
index e71d023..7b2e9b5 100644
--- a/src/Spout/Writer/WriterFactory.php
+++ b/src/Spout/Writer/WriterFactory.php
@@ -5,7 +5,7 @@ namespace Box\Spout\Writer;
 use Box\Spout\Common\Exception\UnsupportedTypeException;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;
 use Box\Spout\Common\Type;
-use Box\Spout\Writer\Creator\EntityFactory;
+use Box\Spout\Writer\Common\Creator\EntityFactory;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**
diff --git a/src/Spout/Writer/WriterMultiSheetsAbstract.php b/src/Spout/Writer/WriterMultiSheetsAbstract.php
index 4c82b8d..0784a47 100644
--- a/src/Spout/Writer/WriterMultiSheetsAbstract.php
+++ b/src/Spout/Writer/WriterMultiSheetsAbstract.php
@@ -2,12 +2,12 @@
 
 namespace Box\Spout\Writer;
 
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
-use Box\Spout\Writer\Creator\InternalFactoryInterface;
-use Box\Spout\Writer\Manager\WorkbookManagerInterface;
+use Box\Spout\Writer\Common\Creator\InternalFactoryInterface;
+use Box\Spout\Writer\Common\Manager\WorkbookManagerInterface;
 
 /**
  * Class WriterMultiSheetsAbstract
diff --git a/src/Spout/Writer/XLSX/Creator/InternalFactory.php b/src/Spout/Writer/XLSX/Creator/InternalFactory.php
index 5d4ba1a..301cf33 100644
--- a/src/Spout/Writer/XLSX/Creator/InternalFactory.php
+++ b/src/Spout/Writer/XLSX/Creator/InternalFactory.php
@@ -4,12 +4,12 @@ namespace Box\Spout\Writer\XLSX\Creator;
 
 use Box\Spout\Common\Escaper;
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Creator\EntityFactory;
-use Box\Spout\Writer\Creator\InternalFactoryInterface;
-use Box\Spout\Writer\Creator\WorkbookFactory;
-use Box\Spout\Writer\Creator\WorksheetFactory;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Creator\EntityFactory;
+use Box\Spout\Writer\Common\Creator\InternalFactoryInterface;
+use Box\Spout\Writer\Common\Creator\WorkbookFactory;
+use Box\Spout\Writer\Common\Creator\WorksheetFactory;
 use Box\Spout\Writer\XLSX\Helper\FileSystemHelper;
 use Box\Spout\Writer\XLSX\Helper\SharedStringsHelper;
 use Box\Spout\Writer\XLSX\Helper\StyleHelper;
diff --git a/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php b/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php
index 752183d..95cc794 100644
--- a/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php
+++ b/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php
@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\XLSX\Helper;
 
 use Box\Spout\Writer\Common\Helper\FileSystemWithRootFolderHelperInterface;
 use Box\Spout\Writer\Common\Helper\ZipHelper;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 
 /**
  * Class FileSystemHelper
diff --git a/src/Spout/Writer/XLSX/Manager/OptionsManager.php b/src/Spout/Writer/XLSX/Manager/OptionsManager.php
index 3439048..5980d91 100644
--- a/src/Spout/Writer/XLSX/Manager/OptionsManager.php
+++ b/src/Spout/Writer/XLSX/Manager/OptionsManager.php
@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\XLSX\Manager;
 
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Manager\OptionsManagerAbstract;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Manager\OptionsManagerAbstract;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**
diff --git a/src/Spout/Writer/XLSX/Manager/WorkbookManager.php b/src/Spout/Writer/XLSX/Manager/WorkbookManager.php
index 29c559c..cb1c50d 100644
--- a/src/Spout/Writer/XLSX/Manager/WorkbookManager.php
+++ b/src/Spout/Writer/XLSX/Manager/WorkbookManager.php
@@ -3,7 +3,7 @@
 namespace Box\Spout\Writer\XLSX\Manager;
 
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Manager\WorkbookManagerAbstract;
+use Box\Spout\Writer\Common\Manager\WorkbookManagerAbstract;
 use Box\Spout\Writer\XLSX\Helper\FileSystemHelper;
 use Box\Spout\Writer\XLSX\Helper\StyleHelper;
 
diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
index 6349a92..07f5550 100644
--- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
+++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
@@ -6,11 +6,11 @@ use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Writer\Common\Helper\CellHelper;
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Entity\Cell;
-use Box\Spout\Writer\Entity\Worksheet;
-use Box\Spout\Writer\Manager\WorksheetManagerInterface;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Worksheet;
+use Box\Spout\Writer\Common\Manager\WorksheetManagerInterface;
 use Box\Spout\Writer\Style\Style;
 use Box\Spout\Writer\XLSX\Helper\SharedStringsHelper;
 use Box\Spout\Writer\XLSX\Helper\StyleHelper;
diff --git a/src/Spout/Writer/XLSX/Writer.php b/src/Spout/Writer/XLSX/Writer.php
index 1a2441f..f270921 100644
--- a/src/Spout/Writer/XLSX/Writer.php
+++ b/src/Spout/Writer/XLSX/Writer.php
@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\XLSX;
 
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Options;
 use Box\Spout\Writer\WriterMultiSheetsAbstract;
 
 /**
diff --git a/tests/Spout/Writer/CSV/WriterTest.php b/tests/Spout/Writer/CSV/WriterTest.php
index fe2b367..4fa7bfc 100644
--- a/tests/Spout/Writer/CSV/WriterTest.php
+++ b/tests/Spout/Writer/CSV/WriterTest.php
@@ -5,7 +5,7 @@ namespace Box\Spout\Writer\CSV;
 use Box\Spout\TestUsingResource;
 use Box\Spout\Common\Type;
 use Box\Spout\Common\Helper\EncodingHelper;
-use Box\Spout\Writer\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 
 /**
diff --git a/tests/Spout/Writer/Manager/OptionsManagerTest.php b/tests/Spout/Writer/Common/Manager/OptionsManagerTest.php
similarity index 95%
rename from tests/Spout/Writer/Manager/OptionsManagerTest.php
rename to tests/Spout/Writer/Common/Manager/OptionsManagerTest.php
index 2f9b4d4..7598bcc 100644
--- a/tests/Spout/Writer/Manager/OptionsManagerTest.php
+++ b/tests/Spout/Writer/Common/Manager/OptionsManagerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 /**
  * Class OptionsManagerTest
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 class OptionsManagerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Spout/Writer/ODS/WriterTest.php b/tests/Spout/Writer/ODS/WriterTest.php
index acd46d3..38c0aaf 100644
--- a/tests/Spout/Writer/ODS/WriterTest.php
+++ b/tests/Spout/Writer/ODS/WriterTest.php
@@ -7,7 +7,7 @@ use Box\Spout\Common\Type;
 use Box\Spout\Reader\Wrapper\XMLReader;
 use Box\Spout\TestUsingResource;
 use Box\Spout\Writer\Common\Helper\ZipHelper;
-use Box\Spout\Writer\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 
 /**
diff --git a/tests/Spout/Writer/XLSX/WriterTest.php b/tests/Spout/Writer/XLSX/WriterTest.php
index 8ac9207..62009aa 100644
--- a/tests/Spout/Writer/XLSX/WriterTest.php
+++ b/tests/Spout/Writer/XLSX/WriterTest.php
@@ -5,7 +5,7 @@ namespace Box\Spout\Writer\XLSX;
 use Box\Spout\Common\Exception\SpoutException;
 use Box\Spout\Common\Type;
 use Box\Spout\TestUsingResource;
-use Box\Spout\Writer\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 use Box\Spout\Writer\XLSX\Manager\WorksheetManager;