diff --git a/src/Spout/Writer/CSV/Manager/OptionsManager.php b/src/Spout/Writer/CSV/Manager/OptionsManager.php
index fc96170..73a47c5 100644
--- a/src/Spout/Writer/CSV/Manager/OptionsManager.php
+++ b/src/Spout/Writer/CSV/Manager/OptionsManager.php
@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\CSV\Manager;
 
-use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Manager\OptionsManagerAbstract;
 
 /**
diff --git a/src/Spout/Writer/CSV/Writer.php b/src/Spout/Writer/CSV/Writer.php
index d94aa05..8a58efa 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\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 
 /**
  * Class Writer
diff --git a/src/Spout/Writer/Common/Cell.php b/src/Spout/Writer/Entity/Cell.php
similarity index 97%
rename from src/Spout/Writer/Common/Cell.php
rename to src/Spout/Writer/Entity/Cell.php
index e08b958..230de6a 100644
--- a/src/Spout/Writer/Common/Cell.php
+++ b/src/Spout/Writer/Entity/Cell.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Box\Spout\Writer\Common;
+namespace Box\Spout\Writer\Entity;
 
 use Box\Spout\Writer\Common\Helper\CellHelper;
 
 /**
  * Class Cell
  *
- * @package Box\Spout\Writer\Common
+ * @package Box\Spout\Writer\Entity
  */
 class Cell
 {
diff --git a/src/Spout/Writer/Common/Options.php b/src/Spout/Writer/Entity/Options.php
similarity index 88%
rename from src/Spout/Writer/Common/Options.php
rename to src/Spout/Writer/Entity/Options.php
index 62d0aaf..701b105 100644
--- a/src/Spout/Writer/Common/Options.php
+++ b/src/Spout/Writer/Entity/Options.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Common;
+namespace Box\Spout\Writer\Entity;
 
 /**
  * Class Options
  * Writer' options holder
  *
- * @package Box\Spout\Writer\Common
+ * @package Box\Spout\Writer\Entity
  */
 abstract class Options
 {
diff --git a/src/Spout/Writer/Manager/WorkbookManagerAbstract.php b/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
index 1d6028d..04c6bca 100644
--- a/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
+++ b/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
@@ -6,7 +6,7 @@ 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\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Common\Sheet;
 use Box\Spout\Writer\Entity\Workbook;
 use Box\Spout\Writer\Entity\Worksheet;
diff --git a/src/Spout/Writer/ODS/Factory/InternalFactory.php b/src/Spout/Writer/ODS/Factory/InternalFactory.php
index c6d71a2..d775db2 100644
--- a/src/Spout/Writer/ODS/Factory/InternalFactory.php
+++ b/src/Spout/Writer/ODS/Factory/InternalFactory.php
@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\ODS\Factory;
 
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Factory\EntityFactory;
 use Box\Spout\Writer\Factory\InternalFactoryInterface;
 use Box\Spout\Writer\ODS\Helper\FileSystemHelper;
diff --git a/src/Spout/Writer/ODS/Manager/OptionsManager.php b/src/Spout/Writer/ODS/Manager/OptionsManager.php
index af342cf..c395e81 100644
--- a/src/Spout/Writer/ODS/Manager/OptionsManager.php
+++ b/src/Spout/Writer/ODS/Manager/OptionsManager.php
@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\ODS\Manager;
 
-use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Manager\OptionsManagerAbstract;
 use Box\Spout\Writer\Style\StyleBuilder;
 
diff --git a/src/Spout/Writer/ODS/Manager/WorksheetManager.php b/src/Spout/Writer/ODS/Manager/WorksheetManager.php
index 729b23b..b79f843 100644
--- a/src/Spout/Writer/ODS/Manager/WorksheetManager.php
+++ b/src/Spout/Writer/ODS/Manager/WorksheetManager.php
@@ -5,7 +5,7 @@ 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\Common\Cell;
+use Box\Spout\Writer\Entity\Cell;
 use Box\Spout\Writer\Entity\Worksheet;
 use Box\Spout\Writer\Manager\WorksheetManagerInterface;
 use Box\Spout\Writer\ODS\Helper\StyleHelper;
diff --git a/src/Spout/Writer/ODS/Writer.php b/src/Spout/Writer/ODS/Writer.php
index 374f920..2a5f78c 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\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\WriterMultiSheetsAbstract;
 
 /**
diff --git a/src/Spout/Writer/WriterAbstract.php b/src/Spout/Writer/WriterAbstract.php
index 3f21ef7..4713dfb 100644
--- a/src/Spout/Writer/WriterAbstract.php
+++ b/src/Spout/Writer/WriterAbstract.php
@@ -7,7 +7,7 @@ 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\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Exception\WriterAlreadyOpenedException;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
 
diff --git a/src/Spout/Writer/WriterMultiSheetsAbstract.php b/src/Spout/Writer/WriterMultiSheetsAbstract.php
index 8dce4b1..a659679 100644
--- a/src/Spout/Writer/WriterMultiSheetsAbstract.php
+++ b/src/Spout/Writer/WriterMultiSheetsAbstract.php
@@ -3,7 +3,7 @@
 namespace Box\Spout\Writer;
 
 use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Entity\Worksheet;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
 use Box\Spout\Writer\Factory\InternalFactoryInterface;
diff --git a/src/Spout/Writer/XLSX/Factory/InternalFactory.php b/src/Spout/Writer/XLSX/Factory/InternalFactory.php
index d52176c..249ef62 100644
--- a/src/Spout/Writer/XLSX/Factory/InternalFactory.php
+++ b/src/Spout/Writer/XLSX/Factory/InternalFactory.php
@@ -5,7 +5,7 @@ namespace Box\Spout\Writer\XLSX\Factory;
 use Box\Spout\Common\Escaper;
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Factory\EntityFactory;
 use Box\Spout\Writer\Factory\InternalFactoryInterface;
 use Box\Spout\Writer\Factory\WorkbookFactory;
diff --git a/src/Spout/Writer/XLSX/Manager/OptionsManager.php b/src/Spout/Writer/XLSX/Manager/OptionsManager.php
index ea029c2..3439048 100644
--- a/src/Spout/Writer/XLSX/Manager/OptionsManager.php
+++ b/src/Spout/Writer/XLSX/Manager/OptionsManager.php
@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\XLSX\Manager;
 
-use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Manager\OptionsManagerAbstract;
 use Box\Spout\Writer\Style\StyleBuilder;
 
diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
index b1bf0f8..6349a92 100644
--- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
+++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
@@ -5,10 +5,10 @@ namespace Box\Spout\Writer\XLSX\Manager;
 use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Common\Cell;
 use Box\Spout\Writer\Common\Helper\CellHelper;
 use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Common\Options;
+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\Style\Style;
diff --git a/src/Spout/Writer/XLSX/Writer.php b/src/Spout/Writer/XLSX/Writer.php
index 7aeb096..1a2441f 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\Common\Options;
+use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\WriterMultiSheetsAbstract;
 
 /**
diff --git a/tests/Spout/Writer/CSV/WriterTest.php b/tests/Spout/Writer/CSV/WriterTest.php
index ba569f1..fe2b367 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\Common\Cell;
+use Box\Spout\Writer\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 
 /**
diff --git a/tests/Spout/Writer/ODS/WriterTest.php b/tests/Spout/Writer/ODS/WriterTest.php
index 38b29b0..acd46d3 100644
--- a/tests/Spout/Writer/ODS/WriterTest.php
+++ b/tests/Spout/Writer/ODS/WriterTest.php
@@ -6,8 +6,8 @@ use Box\Spout\Common\Exception\SpoutException;
 use Box\Spout\Common\Type;
 use Box\Spout\Reader\Wrapper\XMLReader;
 use Box\Spout\TestUsingResource;
-use Box\Spout\Writer\Common\Cell;
 use Box\Spout\Writer\Common\Helper\ZipHelper;
+use Box\Spout\Writer\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 
 /**
diff --git a/tests/Spout/Writer/XLSX/WriterTest.php b/tests/Spout/Writer/XLSX/WriterTest.php
index 9fe0ab2..8ac9207 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\Common\Cell;
+use Box\Spout\Writer\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 use Box\Spout\Writer\XLSX\Manager\WorksheetManager;