diff --git a/tests/src/flextype/Content/ContentTest.php b/tests/src/flextype/core/Content/ContentTest.php
similarity index 100%
rename from tests/src/flextype/Content/ContentTest.php
rename to tests/src/flextype/core/Content/ContentTest.php
diff --git a/tests/src/flextype/Content/Fields/CotentFieldTest.php b/tests/src/flextype/core/Content/Fields/CotentFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/CotentFieldTest.php
rename to tests/src/flextype/core/Content/Fields/CotentFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/CreatedAtFieldTest.php b/tests/src/flextype/core/Content/Fields/CreatedAtFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/CreatedAtFieldTest.php
rename to tests/src/flextype/core/Content/Fields/CreatedAtFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/CreatedByFieldTest.php b/tests/src/flextype/core/Content/Fields/CreatedByFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/CreatedByFieldTest.php
rename to tests/src/flextype/core/Content/Fields/CreatedByFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/IdFieldTest.php b/tests/src/flextype/core/Content/Fields/IdFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/IdFieldTest.php
rename to tests/src/flextype/core/Content/Fields/IdFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/ModifiedAtFieldTest.php b/tests/src/flextype/core/Content/Fields/ModifiedAtFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/ModifiedAtFieldTest.php
rename to tests/src/flextype/core/Content/Fields/ModifiedAtFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/ParsersFieldTest.php b/tests/src/flextype/core/Content/Fields/ParsersFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/ParsersFieldTest.php
rename to tests/src/flextype/core/Content/Fields/ParsersFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/PublishedAtFieldTest.php b/tests/src/flextype/core/Content/Fields/PublishedAtFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/PublishedAtFieldTest.php
rename to tests/src/flextype/core/Content/Fields/PublishedAtFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/PublishedByFieldTest.php b/tests/src/flextype/core/Content/Fields/PublishedByFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/PublishedByFieldTest.php
rename to tests/src/flextype/core/Content/Fields/PublishedByFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/RegistryFieldTest.php b/tests/src/flextype/core/Content/Fields/RegistryFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/RegistryFieldTest.php
rename to tests/src/flextype/core/Content/Fields/RegistryFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/RoutableFieldTest.php b/tests/src/flextype/core/Content/Fields/RoutableFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/RoutableFieldTest.php
rename to tests/src/flextype/core/Content/Fields/RoutableFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/SlugFieldTest.php b/tests/src/flextype/core/Content/Fields/SlugFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/SlugFieldTest.php
rename to tests/src/flextype/core/Content/Fields/SlugFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/UuidFieldTest.php b/tests/src/flextype/core/Content/Fields/UuidFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/UuidFieldTest.php
rename to tests/src/flextype/core/Content/Fields/UuidFieldTest.php
diff --git a/tests/src/flextype/Content/Fields/VisibilityFieldTest.php b/tests/src/flextype/core/Content/Fields/VisibilityFieldTest.php
similarity index 100%
rename from tests/src/flextype/Content/Fields/VisibilityFieldTest.php
rename to tests/src/flextype/core/Content/Fields/VisibilityFieldTest.php
diff --git a/tests/src/flextype/FilterHelperTest.php b/tests/src/flextype/core/FilterHelperTest.php
similarity index 100%
rename from tests/src/flextype/FilterHelperTest.php
rename to tests/src/flextype/core/FilterHelperTest.php
diff --git a/tests/src/flextype/FindHelperTest.php b/tests/src/flextype/core/FindHelperTest.php
similarity index 100%
rename from tests/src/flextype/FindHelperTest.php
rename to tests/src/flextype/core/FindHelperTest.php
diff --git a/tests/src/flextype/FlextypHelperTest.php b/tests/src/flextype/core/FlextypHelperTest.php
similarity index 100%
rename from tests/src/flextype/FlextypHelperTest.php
rename to tests/src/flextype/core/FlextypHelperTest.php
diff --git a/tests/src/flextype/FlextypeTest.php b/tests/src/flextype/core/FlextypeTest.php
similarity index 100%
rename from tests/src/flextype/FlextypeTest.php
rename to tests/src/flextype/core/FlextypeTest.php
diff --git a/tests/src/flextype/Media/MediaTest.php b/tests/src/flextype/core/Media/MediaTest.php
similarity index 100%
rename from tests/src/flextype/Media/MediaTest.php
rename to tests/src/flextype/core/Media/MediaTest.php
diff --git a/tests/src/flextype/Parsers/MarkdownTest.php b/tests/src/flextype/core/Parsers/MarkdownTest.php
similarity index 100%
rename from tests/src/flextype/Parsers/MarkdownTest.php
rename to tests/src/flextype/core/Parsers/MarkdownTest.php
diff --git a/tests/src/flextype/Parsers/ShortcodeTest.php b/tests/src/flextype/core/Parsers/ShortcodeTest.php
similarity index 100%
rename from tests/src/flextype/Parsers/ShortcodeTest.php
rename to tests/src/flextype/core/Parsers/ShortcodeTest.php
diff --git a/tests/src/flextype/Parsers/Shortcodes/EntriesShortcodeTest.php b/tests/src/flextype/core/Parsers/Shortcodes/EntriesShortcodeTest.php
similarity index 100%
rename from tests/src/flextype/Parsers/Shortcodes/EntriesShortcodeTest.php
rename to tests/src/flextype/core/Parsers/Shortcodes/EntriesShortcodeTest.php
diff --git a/tests/src/flextype/Parsers/Shortcodes/RawShortcodeTest.php b/tests/src/flextype/core/Parsers/Shortcodes/RawShortcodeTest.php
similarity index 100%
rename from tests/src/flextype/Parsers/Shortcodes/RawShortcodeTest.php
rename to tests/src/flextype/core/Parsers/Shortcodes/RawShortcodeTest.php
diff --git a/tests/src/flextype/Parsers/Shortcodes/RegistryShortcodeTest.php b/tests/src/flextype/core/Parsers/Shortcodes/RegistryShortcodeTest.php
similarity index 100%
rename from tests/src/flextype/Parsers/Shortcodes/RegistryShortcodeTest.php
rename to tests/src/flextype/core/Parsers/Shortcodes/RegistryShortcodeTest.php
diff --git a/tests/src/flextype/Parsers/Shortcodes/UrlShortcodeTest.php b/tests/src/flextype/core/Parsers/Shortcodes/UrlShortcodeTest.php
similarity index 100%
rename from tests/src/flextype/Parsers/Shortcodes/UrlShortcodeTest.php
rename to tests/src/flextype/core/Parsers/Shortcodes/UrlShortcodeTest.php
diff --git a/tests/src/flextype/PluginsTest.php b/tests/src/flextype/core/PluginsTest.php
similarity index 100%
rename from tests/src/flextype/PluginsTest.php
rename to tests/src/flextype/core/PluginsTest.php
diff --git a/tests/src/flextype/Serializers/FrontmatterTest.php b/tests/src/flextype/core/Serializers/FrontmatterTest.php
similarity index 100%
rename from tests/src/flextype/Serializers/FrontmatterTest.php
rename to tests/src/flextype/core/Serializers/FrontmatterTest.php
diff --git a/tests/src/flextype/Serializers/JsonTest.php b/tests/src/flextype/core/Serializers/JsonTest.php
similarity index 100%
rename from tests/src/flextype/Serializers/JsonTest.php
rename to tests/src/flextype/core/Serializers/JsonTest.php
diff --git a/tests/src/flextype/Serializers/NeonTest.php b/tests/src/flextype/core/Serializers/NeonTest.php
similarity index 100%
rename from tests/src/flextype/Serializers/NeonTest.php
rename to tests/src/flextype/core/Serializers/NeonTest.php
diff --git a/tests/src/flextype/Serializers/YamlTest.php b/tests/src/flextype/core/Serializers/YamlTest.php
similarity index 100%
rename from tests/src/flextype/Serializers/YamlTest.php
rename to tests/src/flextype/core/Serializers/YamlTest.php