diff --git a/src/PhpWord/Container/Container.php b/src/PhpWord/Element/AbstractElement.php
similarity index 100%
rename from src/PhpWord/Container/Container.php
rename to src/PhpWord/Element/AbstractElement.php
diff --git a/src/PhpWord/Container/Footer.php b/src/PhpWord/Element/Footer.php
similarity index 100%
rename from src/PhpWord/Container/Footer.php
rename to src/PhpWord/Element/Footer.php
diff --git a/src/PhpWord/Container/Header.php b/src/PhpWord/Element/Header.php
similarity index 100%
rename from src/PhpWord/Container/Header.php
rename to src/PhpWord/Element/Header.php
diff --git a/src/PhpWord/Container/Section.php b/src/PhpWord/Element/Section.php
similarity index 100%
rename from src/PhpWord/Container/Section.php
rename to src/PhpWord/Element/Section.php
diff --git a/src/PhpWord/Container/Settings.php b/src/PhpWord/Style/Section.php
similarity index 100%
rename from src/PhpWord/Container/Settings.php
rename to src/PhpWord/Style/Section.php
diff --git a/tests/PhpWord/Tests/Container/FooterTest.php b/tests/PhpWord/Tests/Element/FooterTest.php
similarity index 100%
rename from tests/PhpWord/Tests/Container/FooterTest.php
rename to tests/PhpWord/Tests/Element/FooterTest.php
diff --git a/tests/PhpWord/Tests/Container/HeaderTest.php b/tests/PhpWord/Tests/Element/HeaderTest.php
similarity index 100%
rename from tests/PhpWord/Tests/Container/HeaderTest.php
rename to tests/PhpWord/Tests/Element/HeaderTest.php
diff --git a/tests/PhpWord/Tests/Container/SectionTest.php b/tests/PhpWord/Tests/Element/SectionTest.php
similarity index 100%
rename from tests/PhpWord/Tests/Container/SectionTest.php
rename to tests/PhpWord/Tests/Element/SectionTest.php
diff --git a/tests/PhpWord/Tests/Container/SettingsTest.php b/tests/PhpWord/Tests/Style/SectionTest.php
similarity index 100%
rename from tests/PhpWord/Tests/Container/SettingsTest.php
rename to tests/PhpWord/Tests/Style/SectionTest.php