diff --git a/test/PhpWord/AutoloaderTest.php b/test/PhpWord/Tests/AutoloaderTest.php
similarity index 97%
rename from test/PhpWord/AutoloaderTest.php
rename to test/PhpWord/Tests/AutoloaderTest.php
index 2a5e7cf9..5657fe6b 100644
--- a/test/PhpWord/AutoloaderTest.php
+++ b/test/PhpWord/Tests/AutoloaderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\Autoloader;
 
diff --git a/test/PhpWord/DocumentPropertiesTest.php b/test/PhpWord/Tests/DocumentPropertiesTest.php
similarity index 99%
rename from test/PhpWord/DocumentPropertiesTest.php
rename to test/PhpWord/Tests/DocumentPropertiesTest.php
index d1c0224b..220dd1ba 100644
--- a/test/PhpWord/DocumentPropertiesTest.php
+++ b/test/PhpWord/Tests/DocumentPropertiesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\DocumentProperties;
 
diff --git a/test/PhpWord/Exceptions/ExceptionTest.php b/test/PhpWord/Tests/Exceptions/ExceptionTest.php
similarity index 88%
rename from test/PhpWord/Exceptions/ExceptionTest.php
rename to test/PhpWord/Tests/Exceptions/ExceptionTest.php
index 2792f716..8b5dc11f 100644
--- a/test/PhpWord/Exceptions/ExceptionTest.php
+++ b/test/PhpWord/Tests/Exceptions/ExceptionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Exceptions;
+namespace PhpOffice\PhpWord\Tests\Exceptions;
 
 use PhpOffice\PhpWord\Exceptions\Exception;
 
diff --git a/test/PhpWord/Exceptions/InvalidImageExceptionTest.php b/test/PhpWord/Tests/Exceptions/InvalidImageExceptionTest.php
similarity index 89%
rename from test/PhpWord/Exceptions/InvalidImageExceptionTest.php
rename to test/PhpWord/Tests/Exceptions/InvalidImageExceptionTest.php
index cd50c3ce..9c124548 100644
--- a/test/PhpWord/Exceptions/InvalidImageExceptionTest.php
+++ b/test/PhpWord/Tests/Exceptions/InvalidImageExceptionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Exceptions;
+namespace PhpOffice\PhpWord\Tests\Exceptions;
 
 use PhpOffice\PhpWord\Exceptions\InvalidImageException;
 
diff --git a/test/PhpWord/Exceptions/InvalidStyleExceptionTest.php b/test/PhpWord/Tests/Exceptions/InvalidStyleExceptionTest.php
similarity index 89%
rename from test/PhpWord/Exceptions/InvalidStyleExceptionTest.php
rename to test/PhpWord/Tests/Exceptions/InvalidStyleExceptionTest.php
index 77bf27e4..58430547 100644
--- a/test/PhpWord/Exceptions/InvalidStyleExceptionTest.php
+++ b/test/PhpWord/Tests/Exceptions/InvalidStyleExceptionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Exceptions;
+namespace PhpOffice\PhpWord\Tests\Exceptions;
 
 use PhpOffice\PhpWord\Exceptions\InvalidStyleException;
 
diff --git a/test/PhpWord/Exceptions/UnsupportedImageTypeExceptionTest.php b/test/PhpWord/Tests/Exceptions/UnsupportedImageTypeExceptionTest.php
similarity index 90%
rename from test/PhpWord/Exceptions/UnsupportedImageTypeExceptionTest.php
rename to test/PhpWord/Tests/Exceptions/UnsupportedImageTypeExceptionTest.php
index 75ff455b..f50f8e9e 100644
--- a/test/PhpWord/Exceptions/UnsupportedImageTypeExceptionTest.php
+++ b/test/PhpWord/Tests/Exceptions/UnsupportedImageTypeExceptionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Exceptions;
+namespace PhpOffice\PhpWord\Tests\Exceptions;
 
 use PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException;
 
diff --git a/test/PhpWord/IOFactoryTest.php b/test/PhpWord/Tests/IOFactoryTest.php
similarity index 97%
rename from test/PhpWord/IOFactoryTest.php
rename to test/PhpWord/Tests/IOFactoryTest.php
index 1ac2a381..810f00b5 100644
--- a/test/PhpWord/IOFactoryTest.php
+++ b/test/PhpWord/Tests/IOFactoryTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\IOFactory;
diff --git a/test/PhpWord/MediaTest.php b/test/PhpWord/Tests/MediaTest.php
similarity index 98%
rename from test/PhpWord/MediaTest.php
rename to test/PhpWord/Tests/MediaTest.php
index 7969b442..bc78ee5b 100644
--- a/test/PhpWord/MediaTest.php
+++ b/test/PhpWord/Tests/MediaTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\Section;
diff --git a/test/PhpWord/PhpWordTest.php b/test/PhpWord/Tests/PhpWordTest.php
similarity index 99%
rename from test/PhpWord/PhpWordTest.php
rename to test/PhpWord/Tests/PhpWordTest.php
index d9896d18..7f8de84a 100644
--- a/test/PhpWord/PhpWordTest.php
+++ b/test/PhpWord/Tests/PhpWordTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\DocumentProperties;
diff --git a/test/PhpWord/Reader/Word2007Test.php b/test/PhpWord/Tests/Reader/Word2007Test.php
similarity index 97%
rename from test/PhpWord/Reader/Word2007Test.php
rename to test/PhpWord/Tests/Reader/Word2007Test.php
index ef25e822..41bc1257 100644
--- a/test/PhpWord/Reader/Word2007Test.php
+++ b/test/PhpWord/Tests/Reader/Word2007Test.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Reader;
+namespace PhpOffice\PhpWord\Tests\Reader;
 
 use PhpOffice\PhpWord\Reader\Word2007;
 use PhpOffice\PhpWord\IOFactory;
diff --git a/test/PhpWord/Section/Footer/PreserveTextTest.php b/test/PhpWord/Tests/Section/Footer/PreserveTextTest.php
similarity index 96%
rename from test/PhpWord/Section/Footer/PreserveTextTest.php
rename to test/PhpWord/Tests/Section/Footer/PreserveTextTest.php
index 0febead5..f9fb9aa9 100644
--- a/test/PhpWord/Section/Footer/PreserveTextTest.php
+++ b/test/PhpWord/Tests/Section/Footer/PreserveTextTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section\Footer;
+namespace PhpOffice\PhpWord\Tests\Section\Footer;
 
 use PhpOffice\PhpWord\Section\Footer\PreserveText;
 
diff --git a/test/PhpWord/Section/FooterTest.php b/test/PhpWord/Tests/Section/FooterTest.php
similarity index 98%
rename from test/PhpWord/Section/FooterTest.php
rename to test/PhpWord/Tests/Section/FooterTest.php
index 18abf53a..8d012d28 100644
--- a/test/PhpWord/Section/FooterTest.php
+++ b/test/PhpWord/Tests/Section/FooterTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Footer;
 
diff --git a/test/PhpWord/Section/FootnoteTest.php b/test/PhpWord/Tests/Section/FootnoteTest.php
similarity index 97%
rename from test/PhpWord/Section/FootnoteTest.php
rename to test/PhpWord/Tests/Section/FootnoteTest.php
index ca3be2ca..22b5087b 100644
--- a/test/PhpWord/Section/FootnoteTest.php
+++ b/test/PhpWord/Tests/Section/FootnoteTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Footnote;
 
diff --git a/test/PhpWord/Section/HeaderTest.php b/test/PhpWord/Tests/Section/HeaderTest.php
similarity index 99%
rename from test/PhpWord/Section/HeaderTest.php
rename to test/PhpWord/Tests/Section/HeaderTest.php
index 26e4087f..e195277e 100644
--- a/test/PhpWord/Section/HeaderTest.php
+++ b/test/PhpWord/Tests/Section/HeaderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Header;
 
diff --git a/test/PhpWord/Section/ImageTest.php b/test/PhpWord/Tests/Section/ImageTest.php
similarity index 98%
rename from test/PhpWord/Section/ImageTest.php
rename to test/PhpWord/Tests/Section/ImageTest.php
index bfb38aea..6dc0ed5c 100644
--- a/test/PhpWord/Section/ImageTest.php
+++ b/test/PhpWord/Tests/Section/ImageTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Image;
 
diff --git a/test/PhpWord/Section/LinkTest.php b/test/PhpWord/Tests/Section/LinkTest.php
similarity index 97%
rename from test/PhpWord/Section/LinkTest.php
rename to test/PhpWord/Tests/Section/LinkTest.php
index 0d20a6fa..3029b6fa 100644
--- a/test/PhpWord/Section/LinkTest.php
+++ b/test/PhpWord/Tests/Section/LinkTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Link;
 use PhpOffice\PhpWord\Style\Font;
diff --git a/test/PhpWord/Section/ListItemTest.php b/test/PhpWord/Tests/Section/ListItemTest.php
similarity index 95%
rename from test/PhpWord/Section/ListItemTest.php
rename to test/PhpWord/Tests/Section/ListItemTest.php
index aa6142ed..2a95bb39 100644
--- a/test/PhpWord/Section/ListItemTest.php
+++ b/test/PhpWord/Tests/Section/ListItemTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\ListItem;
 
diff --git a/test/PhpWord/Section/MemoryImageTest.php b/test/PhpWord/Tests/Section/MemoryImageTest.php
similarity index 98%
rename from test/PhpWord/Section/MemoryImageTest.php
rename to test/PhpWord/Tests/Section/MemoryImageTest.php
index 8869ad5b..5d1c7fcd 100644
--- a/test/PhpWord/Section/MemoryImageTest.php
+++ b/test/PhpWord/Tests/Section/MemoryImageTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\MemoryImage;
 
diff --git a/test/PhpWord/Section/ObjectTest.php b/test/PhpWord/Tests/Section/ObjectTest.php
similarity index 98%
rename from test/PhpWord/Section/ObjectTest.php
rename to test/PhpWord/Tests/Section/ObjectTest.php
index 22d713c2..0b7065b3 100644
--- a/test/PhpWord/Section/ObjectTest.php
+++ b/test/PhpWord/Tests/Section/ObjectTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Object;
 
diff --git a/test/PhpWord/Section/PageBreakTest.php b/test/PhpWord/Tests/Section/PageBreakTest.php
similarity index 89%
rename from test/PhpWord/Section/PageBreakTest.php
rename to test/PhpWord/Tests/Section/PageBreakTest.php
index f01803ce..4bf414ad 100644
--- a/test/PhpWord/Section/PageBreakTest.php
+++ b/test/PhpWord/Tests/Section/PageBreakTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\PageBreak;
 
diff --git a/test/PhpWord/Section/SettingsTest.php b/test/PhpWord/Tests/Section/SettingsTest.php
similarity index 99%
rename from test/PhpWord/Section/SettingsTest.php
rename to test/PhpWord/Tests/Section/SettingsTest.php
index b7803168..c8fcd637 100644
--- a/test/PhpWord/Section/SettingsTest.php
+++ b/test/PhpWord/Tests/Section/SettingsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Settings;
 
diff --git a/test/PhpWord/Section/Table/CellTest.php b/test/PhpWord/Tests/Section/Table/CellTest.php
similarity index 99%
rename from test/PhpWord/Section/Table/CellTest.php
rename to test/PhpWord/Tests/Section/Table/CellTest.php
index bca9a1b5..61ec05dd 100644
--- a/test/PhpWord/Section/Table/CellTest.php
+++ b/test/PhpWord/Tests/Section/Table/CellTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section\Table;
+namespace PhpOffice\PhpWord\Tests\Section\Table;
 
 use PhpOffice\PhpWord\Section\Table\Cell;
 
diff --git a/test/PhpWord/Section/Table/RowTest.php b/test/PhpWord/Tests/Section/Table/RowTest.php
similarity index 96%
rename from test/PhpWord/Section/Table/RowTest.php
rename to test/PhpWord/Tests/Section/Table/RowTest.php
index 346c913e..a19bf3c4 100644
--- a/test/PhpWord/Section/Table/RowTest.php
+++ b/test/PhpWord/Tests/Section/Table/RowTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section\Table;
+namespace PhpOffice\PhpWord\Tests\Section\Table;
 
 use PhpOffice\PhpWord\Section\Table\Row;
 
diff --git a/test/PhpWord/Section/TableTest.php b/test/PhpWord/Tests/Section/TableTest.php
similarity index 97%
rename from test/PhpWord/Section/TableTest.php
rename to test/PhpWord/Tests/Section/TableTest.php
index bb488126..df00a232 100644
--- a/test/PhpWord/Section/TableTest.php
+++ b/test/PhpWord/Tests/Section/TableTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Table;
 
diff --git a/test/PhpWord/Section/TextBreakTest.php b/test/PhpWord/Tests/Section/TextBreakTest.php
similarity index 97%
rename from test/PhpWord/Section/TextBreakTest.php
rename to test/PhpWord/Tests/Section/TextBreakTest.php
index 1176714f..32410743 100644
--- a/test/PhpWord/Section/TextBreakTest.php
+++ b/test/PhpWord/Tests/Section/TextBreakTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\TextBreak;
 use PhpOffice\PhpWord\Style\Font;
diff --git a/test/PhpWord/Section/TextRunTest.php b/test/PhpWord/Tests/Section/TextRunTest.php
similarity index 98%
rename from test/PhpWord/Section/TextRunTest.php
rename to test/PhpWord/Tests/Section/TextRunTest.php
index 6fce1634..24ee824a 100644
--- a/test/PhpWord/Section/TextRunTest.php
+++ b/test/PhpWord/Tests/Section/TextRunTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\TextRun;
 
diff --git a/test/PhpWord/Section/TextTest.php b/test/PhpWord/Tests/Section/TextTest.php
similarity index 96%
rename from test/PhpWord/Section/TextTest.php
rename to test/PhpWord/Tests/Section/TextTest.php
index b14bcbf9..f17abc3f 100644
--- a/test/PhpWord/Section/TextTest.php
+++ b/test/PhpWord/Tests/Section/TextTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Text;
 
diff --git a/test/PhpWord/Section/TitleTest.php b/test/PhpWord/Tests/Section/TitleTest.php
similarity index 96%
rename from test/PhpWord/Section/TitleTest.php
rename to test/PhpWord/Tests/Section/TitleTest.php
index 69a01837..7c547c5e 100644
--- a/test/PhpWord/Section/TitleTest.php
+++ b/test/PhpWord/Tests/Section/TitleTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Section;
+namespace PhpOffice\PhpWord\Tests\Section;
 
 use PhpOffice\PhpWord\Section\Title;
 
diff --git a/test/PhpWord/SectionTest.php b/test/PhpWord/Tests/SectionTest.php
similarity index 99%
rename from test/PhpWord/SectionTest.php
rename to test/PhpWord/Tests/SectionTest.php
index 950fc3ee..4f5d31c8 100644
--- a/test/PhpWord/SectionTest.php
+++ b/test/PhpWord/Tests/SectionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\Section;
 
diff --git a/test/PhpWord/SettingsTest.php b/test/PhpWord/Tests/SettingsTest.php
similarity index 94%
rename from test/PhpWord/SettingsTest.php
rename to test/PhpWord/Tests/SettingsTest.php
index b07b3b15..e80679dd 100644
--- a/test/PhpWord/SettingsTest.php
+++ b/test/PhpWord/Tests/SettingsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\Settings;
 
diff --git a/test/PhpWord/Shared/DrawingTest.php b/test/PhpWord/Tests/Shared/DrawingTest.php
similarity index 97%
rename from test/PhpWord/Shared/DrawingTest.php
rename to test/PhpWord/Tests/Shared/DrawingTest.php
index 21116291..c9ccf515 100644
--- a/test/PhpWord/Shared/DrawingTest.php
+++ b/test/PhpWord/Tests/Shared/DrawingTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Shared;
+namespace PhpOffice\PhpWord\Tests\Shared;
 
 use PhpOffice\PhpWord\Shared\Drawing;
 
diff --git a/test/PhpWord/Shared/FileTest.php b/test/PhpWord/Tests/Shared/FileTest.php
similarity index 96%
rename from test/PhpWord/Shared/FileTest.php
rename to test/PhpWord/Tests/Shared/FileTest.php
index d3fd4869..b03d3525 100644
--- a/test/PhpWord/Shared/FileTest.php
+++ b/test/PhpWord/Tests/Shared/FileTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Shared;
+namespace PhpOffice\PhpWord\Tests\Shared;
 
 use PhpOffice\PhpWord\Shared\File;
 
diff --git a/test/PhpWord/Shared/FontTest.php b/test/PhpWord/Tests/Shared/FontTest.php
similarity index 96%
rename from test/PhpWord/Shared/FontTest.php
rename to test/PhpWord/Tests/Shared/FontTest.php
index 64d1c67d..19b450f2 100644
--- a/test/PhpWord/Shared/FontTest.php
+++ b/test/PhpWord/Tests/Shared/FontTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Shared;
+namespace PhpOffice\PhpWord\Tests\Shared;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\Font;
diff --git a/test/PhpWord/Shared/StringTest.php b/test/PhpWord/Tests/Shared/StringTest.php
similarity index 95%
rename from test/PhpWord/Shared/StringTest.php
rename to test/PhpWord/Tests/Shared/StringTest.php
index cc21c2d2..56b54589 100644
--- a/test/PhpWord/Shared/StringTest.php
+++ b/test/PhpWord/Tests/Shared/StringTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Shared;
+namespace PhpOffice\PhpWord\Tests\Shared;
 
 use PhpOffice\PhpWord\Shared\String;
 
diff --git a/test/PhpWord/Style/CellTest.php b/test/PhpWord/Tests/Style/CellTest.php
similarity index 97%
rename from test/PhpWord/Style/CellTest.php
rename to test/PhpWord/Tests/Style/CellTest.php
index 6e540e63..bbdb6535 100644
--- a/test/PhpWord/Style/CellTest.php
+++ b/test/PhpWord/Tests/Style/CellTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\Style\Cell;
 
diff --git a/test/PhpWord/Style/FontTest.php b/test/PhpWord/Tests/Style/FontTest.php
similarity index 98%
rename from test/PhpWord/Style/FontTest.php
rename to test/PhpWord/Tests/Style/FontTest.php
index 4f0cbaa5..c6e27b97 100644
--- a/test/PhpWord/Style/FontTest.php
+++ b/test/PhpWord/Tests/Style/FontTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Style\Font;
diff --git a/test/PhpWord/Style/ImageTest.php b/test/PhpWord/Tests/Style/ImageTest.php
similarity index 97%
rename from test/PhpWord/Style/ImageTest.php
rename to test/PhpWord/Tests/Style/ImageTest.php
index 9c75843e..b53cdc57 100644
--- a/test/PhpWord/Style/ImageTest.php
+++ b/test/PhpWord/Tests/Style/ImageTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\Style\Image;
 
diff --git a/test/PhpWord/Style/ListItemTest.php b/test/PhpWord/Tests/Style/ListItemTest.php
similarity index 95%
rename from test/PhpWord/Style/ListItemTest.php
rename to test/PhpWord/Tests/Style/ListItemTest.php
index 94b1baa2..abdd6562 100644
--- a/test/PhpWord/Style/ListItemTest.php
+++ b/test/PhpWord/Tests/Style/ListItemTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\Style\ListItem;
 
diff --git a/test/PhpWord/Style/ParagraphTest.php b/test/PhpWord/Tests/Style/ParagraphTest.php
similarity index 98%
rename from test/PhpWord/Style/ParagraphTest.php
rename to test/PhpWord/Tests/Style/ParagraphTest.php
index 35f04b5e..0ff5d779 100644
--- a/test/PhpWord/Style/ParagraphTest.php
+++ b/test/PhpWord/Tests/Style/ParagraphTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Style\Paragraph;
diff --git a/test/PhpWord/Style/RowTest.php b/test/PhpWord/Tests/Style/RowTest.php
similarity index 95%
rename from test/PhpWord/Style/RowTest.php
rename to test/PhpWord/Tests/Style/RowTest.php
index af30517a..ca0cc559 100644
--- a/test/PhpWord/Style/RowTest.php
+++ b/test/PhpWord/Tests/Style/RowTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\Style\Row;
 
diff --git a/test/PhpWord/Style/TOCTest.php b/test/PhpWord/Tests/Style/TOCTest.php
similarity index 95%
rename from test/PhpWord/Style/TOCTest.php
rename to test/PhpWord/Tests/Style/TOCTest.php
index 4c6c631a..b525a9c5 100644
--- a/test/PhpWord/Style/TOCTest.php
+++ b/test/PhpWord/Tests/Style/TOCTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\Style\TOC;
 
diff --git a/test/PhpWord/Style/TableFullTest.php b/test/PhpWord/Tests/Style/TableFullTest.php
similarity index 98%
rename from test/PhpWord/Style/TableFullTest.php
rename to test/PhpWord/Tests/Style/TableFullTest.php
index ad3324ca..0552f357 100644
--- a/test/PhpWord/Style/TableFullTest.php
+++ b/test/PhpWord/Tests/Style/TableFullTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\Style\TableFull;
 
diff --git a/test/PhpWord/Style/TableTest.php b/test/PhpWord/Tests/Style/TableTest.php
similarity index 96%
rename from test/PhpWord/Style/TableTest.php
rename to test/PhpWord/Tests/Style/TableTest.php
index 965da9d7..ba6592c0 100644
--- a/test/PhpWord/Style/TableTest.php
+++ b/test/PhpWord/Tests/Style/TableTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\Style\Table;
 
diff --git a/test/PhpWord/Style/TabsTest.php b/test/PhpWord/Tests/Style/TabsTest.php
similarity index 96%
rename from test/PhpWord/Style/TabsTest.php
rename to test/PhpWord/Tests/Style/TabsTest.php
index 7d95be57..3d3fce3e 100644
--- a/test/PhpWord/Style/TabsTest.php
+++ b/test/PhpWord/Tests/Style/TabsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Style;
+namespace PhpOffice\PhpWord\Tests\Style;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Style\Tab;
diff --git a/test/PhpWord/StyleTest.php b/test/PhpWord/Tests/StyleTest.php
similarity index 97%
rename from test/PhpWord/StyleTest.php
rename to test/PhpWord/Tests/StyleTest.php
index 0a95bef2..cc17cb56 100644
--- a/test/PhpWord/StyleTest.php
+++ b/test/PhpWord/Tests/StyleTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\Style;
 
diff --git a/test/PhpWord/TOCTest.php b/test/PhpWord/Tests/TOCTest.php
similarity index 98%
rename from test/PhpWord/TOCTest.php
rename to test/PhpWord/Tests/TOCTest.php
index daa0b5fd..2c21af74 100644
--- a/test/PhpWord/TOCTest.php
+++ b/test/PhpWord/Tests/TOCTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\TOC;
 
diff --git a/test/PhpWord/TemplateTest.php b/test/PhpWord/Tests/TemplateTest.php
similarity index 99%
rename from test/PhpWord/TemplateTest.php
rename to test/PhpWord/Tests/TemplateTest.php
index 7d790e49..63993894 100644
--- a/test/PhpWord/TemplateTest.php
+++ b/test/PhpWord/Tests/TemplateTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Template;
diff --git a/test/PhpWord/Writer/ODText/ContentTest.php b/test/PhpWord/Tests/Writer/ODText/ContentTest.php
similarity index 97%
rename from test/PhpWord/Writer/ODText/ContentTest.php
rename to test/PhpWord/Tests/Writer/ODText/ContentTest.php
index e1f6aa2b..2cfc1758 100644
--- a/test/PhpWord/Writer/ODText/ContentTest.php
+++ b/test/PhpWord/Tests/Writer/ODText/ContentTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\ODText;
+namespace PhpOffice\PhpWord\Tests\Writer\ODText;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpWord\Tests\TestHelperDOCX;
diff --git a/test/PhpWord/Writer/ODText/WriterPartTest.php b/test/PhpWord/Tests/Writer/ODText/WriterPartTest.php
similarity index 95%
rename from test/PhpWord/Writer/ODText/WriterPartTest.php
rename to test/PhpWord/Tests/Writer/ODText/WriterPartTest.php
index 58b0f4a7..5e184700 100644
--- a/test/PhpWord/Writer/ODText/WriterPartTest.php
+++ b/test/PhpWord/Tests/Writer/ODText/WriterPartTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\ODText;
+namespace PhpOffice\PhpWord\Tests\Writer\ODText;
 
 use PhpOffice\PhpWord\Writer\ODText;
 use PhpWord\Tests\TestHelperDOCX;
diff --git a/test/PhpWord/Writer/ODTextTest.php b/test/PhpWord/Tests/Writer/ODTextTest.php
similarity index 99%
rename from test/PhpWord/Writer/ODTextTest.php
rename to test/PhpWord/Tests/Writer/ODTextTest.php
index 1926c959..e07dd13c 100644
--- a/test/PhpWord/Writer/ODTextTest.php
+++ b/test/PhpWord/Tests/Writer/ODTextTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer;
+namespace PhpOffice\PhpWord\Tests\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Writer\ODText;
diff --git a/test/PhpWord/Writer/RTFTest.php b/test/PhpWord/Tests/Writer/RTFTest.php
similarity index 98%
rename from test/PhpWord/Writer/RTFTest.php
rename to test/PhpWord/Tests/Writer/RTFTest.php
index 17bcd1f1..ed6d9873 100644
--- a/test/PhpWord/Writer/RTFTest.php
+++ b/test/PhpWord/Tests/Writer/RTFTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer;
+namespace PhpOffice\PhpWord\Tests\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Writer\RTF;
diff --git a/test/PhpWord/Writer/Word2007/BaseTest.php b/test/PhpWord/Tests/Writer/Word2007/BaseTest.php
similarity index 99%
rename from test/PhpWord/Writer/Word2007/BaseTest.php
rename to test/PhpWord/Tests/Writer/Word2007/BaseTest.php
index a1d19435..c66cb309 100644
--- a/test/PhpWord/Writer/Word2007/BaseTest.php
+++ b/test/PhpWord/Tests/Writer/Word2007/BaseTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\Word2007;
+namespace PhpOffice\PhpWord\Tests\Writer\Word2007;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpWord\Tests\TestHelperDOCX;
diff --git a/test/PhpWord/Writer/Word2007/DocumentTest.php b/test/PhpWord/Tests/Writer/Word2007/DocumentTest.php
similarity index 98%
rename from test/PhpWord/Writer/Word2007/DocumentTest.php
rename to test/PhpWord/Tests/Writer/Word2007/DocumentTest.php
index ef03b1c9..a8e5c398 100644
--- a/test/PhpWord/Writer/Word2007/DocumentTest.php
+++ b/test/PhpWord/Tests/Writer/Word2007/DocumentTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\Word2007;
+namespace PhpOffice\PhpWord\Tests\Writer\Word2007;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpWord\Tests\TestHelperDOCX;
diff --git a/test/PhpWord/Writer/Word2007/FooterTest.php b/test/PhpWord/Tests/Writer/Word2007/FooterTest.php
similarity index 96%
rename from test/PhpWord/Writer/Word2007/FooterTest.php
rename to test/PhpWord/Tests/Writer/Word2007/FooterTest.php
index 9ce5cf97..9221817e 100644
--- a/test/PhpWord/Writer/Word2007/FooterTest.php
+++ b/test/PhpWord/Tests/Writer/Word2007/FooterTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\Word2007;
+namespace PhpOffice\PhpWord\Tests\Writer\Word2007;
 
 use PhpOffice\PhpWord\Writer\Word2007\Footer;
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/test/PhpWord/Writer/Word2007/FootnotesTest.php b/test/PhpWord/Tests/Writer/Word2007/FootnotesTest.php
similarity index 93%
rename from test/PhpWord/Writer/Word2007/FootnotesTest.php
rename to test/PhpWord/Tests/Writer/Word2007/FootnotesTest.php
index 066c089b..aab28481 100644
--- a/test/PhpWord/Writer/Word2007/FootnotesTest.php
+++ b/test/PhpWord/Tests/Writer/Word2007/FootnotesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\Word2007;
+namespace PhpOffice\PhpWord\Tests\Writer\Word2007;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpWord\Tests\TestHelperDOCX;
diff --git a/test/PhpWord/Writer/Word2007/HeaderTest.php b/test/PhpWord/Tests/Writer/Word2007/HeaderTest.php
similarity index 96%
rename from test/PhpWord/Writer/Word2007/HeaderTest.php
rename to test/PhpWord/Tests/Writer/Word2007/HeaderTest.php
index c562e256..20abcdf7 100644
--- a/test/PhpWord/Writer/Word2007/HeaderTest.php
+++ b/test/PhpWord/Tests/Writer/Word2007/HeaderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\Word2007;
+namespace PhpOffice\PhpWord\Tests\Writer\Word2007;
 
 use PhpOffice\PhpWord\Writer\Word2007\Header;
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/test/PhpWord/Writer/Word2007/StylesTest.php b/test/PhpWord/Tests/Writer/Word2007/StylesTest.php
similarity index 97%
rename from test/PhpWord/Writer/Word2007/StylesTest.php
rename to test/PhpWord/Tests/Writer/Word2007/StylesTest.php
index 6ed05f67..874f112f 100644
--- a/test/PhpWord/Writer/Word2007/StylesTest.php
+++ b/test/PhpWord/Tests/Writer/Word2007/StylesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\Word2007;
+namespace PhpOffice\PhpWord\Tests\Writer\Word2007;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpWord\Tests\TestHelperDOCX;
diff --git a/test/PhpWord/Writer/Word2007/WriterPartTest.php b/test/PhpWord/Tests/Writer/Word2007/WriterPartTest.php
similarity index 95%
rename from test/PhpWord/Writer/Word2007/WriterPartTest.php
rename to test/PhpWord/Tests/Writer/Word2007/WriterPartTest.php
index 2b7f68a5..69b19281 100644
--- a/test/PhpWord/Writer/Word2007/WriterPartTest.php
+++ b/test/PhpWord/Tests/Writer/Word2007/WriterPartTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer\Word2007;
+namespace PhpOffice\PhpWord\Tests\Writer\Word2007;
 
 use PhpOffice\PhpWord\Writer\Word2007\WriterPart;
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/test/PhpWord/Writer/Word2007Test.php b/test/PhpWord/Tests/Writer/Word2007Test.php
similarity index 98%
rename from test/PhpWord/Writer/Word2007Test.php
rename to test/PhpWord/Tests/Writer/Word2007Test.php
index feeee723..859f78a4 100644
--- a/test/PhpWord/Writer/Word2007Test.php
+++ b/test/PhpWord/Tests/Writer/Word2007Test.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests\Writer;
+namespace PhpOffice\PhpWord\Tests\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/test/data/documents/reader.docx.zip b/test/PhpWord/Tests/_files/documents/reader.docx.zip
similarity index 100%
rename from test/data/documents/reader.docx.zip
rename to test/PhpWord/Tests/_files/documents/reader.docx.zip
diff --git a/test/data/documents/sheet.xls b/test/PhpWord/Tests/_files/documents/sheet.xls
similarity index 100%
rename from test/data/documents/sheet.xls
rename to test/PhpWord/Tests/_files/documents/sheet.xls
diff --git a/test/data/images/PhpWord.png b/test/PhpWord/Tests/_files/images/PhpWord.png
similarity index 100%
rename from test/data/images/PhpWord.png
rename to test/PhpWord/Tests/_files/images/PhpWord.png
diff --git a/test/data/images/alexz-johnson.pcx b/test/PhpWord/Tests/_files/images/alexz-johnson.pcx
similarity index 100%
rename from test/data/images/alexz-johnson.pcx
rename to test/PhpWord/Tests/_files/images/alexz-johnson.pcx
diff --git a/test/data/images/angela_merkel.tif b/test/PhpWord/Tests/_files/images/angela_merkel.tif
similarity index 100%
rename from test/data/images/angela_merkel.tif
rename to test/PhpWord/Tests/_files/images/angela_merkel.tif
diff --git a/test/data/images/duke_nukem.bmp b/test/PhpWord/Tests/_files/images/duke_nukem.bmp
similarity index 100%
rename from test/data/images/duke_nukem.bmp
rename to test/PhpWord/Tests/_files/images/duke_nukem.bmp
diff --git a/test/data/images/earth.jpg b/test/PhpWord/Tests/_files/images/earth.jpg
similarity index 100%
rename from test/data/images/earth.jpg
rename to test/PhpWord/Tests/_files/images/earth.jpg
diff --git a/test/data/images/firefox.png b/test/PhpWord/Tests/_files/images/firefox.png
similarity index 100%
rename from test/data/images/firefox.png
rename to test/PhpWord/Tests/_files/images/firefox.png
diff --git a/test/data/images/mario.gif b/test/PhpWord/Tests/_files/images/mario.gif
similarity index 100%
rename from test/data/images/mario.gif
rename to test/PhpWord/Tests/_files/images/mario.gif
diff --git a/test/data/images/mars.jpg b/test/PhpWord/Tests/_files/images/mars.jpg
similarity index 100%
rename from test/data/images/mars.jpg
rename to test/PhpWord/Tests/_files/images/mars.jpg
diff --git a/test/data/images/mars_noext_jpg b/test/PhpWord/Tests/_files/images/mars_noext_jpg
similarity index 100%
rename from test/data/images/mars_noext_jpg
rename to test/PhpWord/Tests/_files/images/mars_noext_jpg
diff --git a/test/data/xsl/passthrough.xsl b/test/PhpWord/Tests/_files/xsl/passthrough.xsl
similarity index 100%
rename from test/data/xsl/passthrough.xsl
rename to test/PhpWord/Tests/_files/xsl/passthrough.xsl
diff --git a/test/data/xsl/remove_tables_by_needle.xsl b/test/PhpWord/Tests/_files/xsl/remove_tables_by_needle.xsl
similarity index 100%
rename from test/data/xsl/remove_tables_by_needle.xsl
rename to test/PhpWord/Tests/_files/xsl/remove_tables_by_needle.xsl
diff --git a/test/common/TestHelperDOCX.php b/test/PhpWord/Tests/_includes/TestHelperDOCX.php
similarity index 98%
rename from test/common/TestHelperDOCX.php
rename to test/PhpWord/Tests/_includes/TestHelperDOCX.php
index bd3d4f8c..ff40c15f 100644
--- a/test/common/TestHelperDOCX.php
+++ b/test/PhpWord/Tests/_includes/TestHelperDOCX.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\IOFactory;
diff --git a/test/common/XmlDocument.php b/test/PhpWord/Tests/_includes/XmlDocument.php
similarity index 98%
rename from test/common/XmlDocument.php
rename to test/PhpWord/Tests/_includes/XmlDocument.php
index deee806b..e868df5f 100644
--- a/test/common/XmlDocument.php
+++ b/test/PhpWord/Tests/_includes/XmlDocument.php
@@ -1,5 +1,5 @@
 <?php
-namespace PhpWord\Tests;
+namespace PhpOffice\PhpWord\Tests;
 
 class XmlDocument
 {
diff --git a/test/bootstrap.php b/test/bootstrap.php
index e8192d6b..ad2eec3d 100755
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -10,5 +10,15 @@ if (!\defined('PHPWORD_TESTS_BASE_DIR')) {
 require_once __DIR__ . '/../../src/PhpWord/Autoloader.php';
 \PhpOffice\PhpWord\Autoloader::register();
 
-require_once __DIR__ . '/TestHelperDOCX.php';
-require_once __DIR__ . '/XmlDocument.php';
+spl_autoload_register(function ($class) {
+    $class = ltrim($class, '\\');
+    $prefix = 'PhpOffice\\PhpWord\\Tests';
+    if (strpos($class, $prefix) === 0) {
+        $class = str_replace('\\', DIRECTORY_SEPARATOR, $class);
+        $class = 'PhpWord' . DIRECTORY_SEPARATOR . 'Tests' . DIRECTORY_SEPARATOR . '_includes' . substr($class, strlen($prefix));
+        $file = __DIR__ . DIRECTORY_SEPARATOR . $class . '.php';
+        if (file_exists($file)) {
+            require_once $file;
+        }
+    }
+});
\ No newline at end of file