diff --git a/tests/Foundation/Entries/EntriesTest.php b/tests/Foundation/Content/ContentTest.php
similarity index 100%
rename from tests/Foundation/Entries/EntriesTest.php
rename to tests/Foundation/Content/ContentTest.php
diff --git a/tests/Foundation/Entries/Fields/EntriesFieldTest.php b/tests/Foundation/Content/Fields/ContentFieldTest.php
similarity index 74%
rename from tests/Foundation/Entries/Fields/EntriesFieldTest.php
rename to tests/Foundation/Content/Fields/ContentFieldTest.php
index 8f96ec13..5d4b6524 100644
--- a/tests/Foundation/Entries/Fields/EntriesFieldTest.php
+++ b/tests/Foundation/Content/Fields/ContentFieldTest.php
@@ -3,30 +3,30 @@
 use Flextype\Component\Filesystem\Filesystem;
 
 beforeEach(function() {
-    filesystem()->directory(PATH['project'] . '/entries')->create();
+    filesystem()->directory(PATH['project'] . '/content')->create();
 });
 
 afterEach(function (): void {
-    filesystem()->directory(PATH['project'] . '/entries')->delete();
+    filesystem()->directory(PATH['project'] . '/content')->delete();
 });
 
-test('test entries field for blog', function () {
-    flextype('content')->create('blog', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/blog/entry.md')->get()));
-    flextype('content')->create('blog/post-1', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/blog/post-1/entry.md')->get()));
-    flextype('content')->create('blog/post-2', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/blog/post-2/entry.md')->get()));
+test('test content field for blog', function () {
+    flextype('content')->create('blog', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/blog/entry.yaml')->get()));
+    flextype('content')->create('blog/post-1', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/blog/post-1/entry.yaml')->get()));
+    flextype('content')->create('blog/post-2', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/blog/post-2/entry.yaml')->get()));
 
     $blog = flextype('content')->fetch('blog');
 
     $this->assertEquals(14, $blog->count());
 });
 
-test('test entries field for catalog', function () {
+test('test content field for catalog', function () {
 
     // Create catalog
-    flextype('content')->create('catalog', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/catalog/entry.md')->get()));
-    flextype('content')->create('catalog/bikes', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/entry.md')->get()));
-    flextype('content')->create('catalog/bikes/gt', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/gt/entry.md')->get()));
-    flextype('content')->create('catalog/bikes/norco', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/norco/entry.md')->get()));
+    flextype('content')->create('catalog', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/catalog/entry.yaml')->get()));
+    flextype('content')->create('catalog/bikes', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/catalog/bikes/entry.yaml')->get()));
+    flextype('content')->create('catalog/bikes/gt', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/catalog/bikes/gt/entry.yaml')->get()));
+    flextype('content')->create('catalog/bikes/norco', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/catalog/bikes/norco/entry.yaml')->get()));
     flextype('content')->create('catalog/bikes/foo', ['title' => 'foo']);
     flextype('content')->create('catalog/bikes/foo/bar', ['title' => 'bar']);
 
@@ -63,12 +63,12 @@ test('test entries field for catalog', function () {
     $this->assertEquals('banner', $banner['id']);
 });
 
-test('test entries field for albmus', function () {
-    flextype('content')->create('root', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/root/entry.md')->get()));
+test('test content field for albmus', function () {
+    flextype('content')->create('root', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/root/entry.yaml')->get()));
 
-    flextype('content')->create('albums', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/entry.md')->get()));
-    flextype('content')->create('albums/category-1', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/category-1/entry.md')->get()));
-    flextype('content')->create('albums/category-1/album-1', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/category-1/album-1/entry.md')->get()));
+    flextype('content')->create('albums', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/root/albums/entry.yaml')->get()));
+    flextype('content')->create('albums/category-1', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/root/albums/category-1/entry.yaml')->get()));
+    flextype('content')->create('albums/category-1/album-1', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/root/albums/category-1/album-1/entry.yaml')->get()));
 
     flextype('content')->create('banners', ['title' => 'Banners']);
     flextype('content')->create('banners/1', ['title' => 'Banner1']);
@@ -79,11 +79,11 @@ test('test entries field for albmus', function () {
     $this->assertEquals(16, $root->count());
 });
 
-test('test entries field for long nested entries', function () {
-    flextype('content')->create('level1', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/level1/entry.md')->get()));
-    flextype('content')->create('level1/level2', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/entry.md')->get()));
-    flextype('content')->create('level1/level2/level3', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/level3/entry.md')->get()));
-    flextype('content')->create('level1/level2/level3/level4', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/level3/level4/entry.md')->get()));
+test('test content field for long nested content', function () {
+    flextype('content')->create('level1', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/level1/entry.yaml')->get()));
+    flextype('content')->create('level1/level2', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/level1/level2/entry.yaml')->get()));
+    flextype('content')->create('level1/level2/level3', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/level1/level2/level3/entry.yaml')->get()));
+    flextype('content')->create('level1/level2/level3/level4', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/level1/level2/level3/level4/entry.yaml')->get()));
 
     $level = flextype('content')->fetch('level1');
 
@@ -93,8 +93,8 @@ test('test entries field for long nested entries', function () {
     $this->assertEquals('level1/level2/level3/level4', $level['root']['root']['root']['id']);
 });
 
-test('test entries field for macroable fetch entries', function () {
-    flextype('content')->create('macroable', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/macroable/entry.md')->get()));
+test('test content field for macroable fetch content', function () {
+    flextype('content')->create('macroable', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/content/macroable/entry.yaml')->get()));
 
     flextype('content')::macro('fetchExtraData', function ($id, $options) {
         return ['id' => $id, 'options' => $options];
diff --git a/tests/Foundation/Entries/Fields/CreatedAtFieldTest.php b/tests/Foundation/Content/Fields/CreatedAtFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/CreatedAtFieldTest.php
rename to tests/Foundation/Content/Fields/CreatedAtFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/CreatedByFieldTest.php b/tests/Foundation/Content/Fields/CreatedByFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/CreatedByFieldTest.php
rename to tests/Foundation/Content/Fields/CreatedByFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/IdFieldTest.php b/tests/Foundation/Content/Fields/IdFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/IdFieldTest.php
rename to tests/Foundation/Content/Fields/IdFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/MediaFieldTest.php b/tests/Foundation/Content/Fields/MediaFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/MediaFieldTest.php
rename to tests/Foundation/Content/Fields/MediaFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/ModifiedAtFieldTest.php b/tests/Foundation/Content/Fields/ModifiedAtFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/ModifiedAtFieldTest.php
rename to tests/Foundation/Content/Fields/ModifiedAtFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/ParsersFieldTest.php b/tests/Foundation/Content/Fields/ParsersFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/ParsersFieldTest.php
rename to tests/Foundation/Content/Fields/ParsersFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/PublishedAtFieldTest.php b/tests/Foundation/Content/Fields/PublishedAtFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/PublishedAtFieldTest.php
rename to tests/Foundation/Content/Fields/PublishedAtFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/PublishedByFieldTest.php b/tests/Foundation/Content/Fields/PublishedByFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/PublishedByFieldTest.php
rename to tests/Foundation/Content/Fields/PublishedByFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/RegistryFieldTest.php b/tests/Foundation/Content/Fields/RegistryFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/RegistryFieldTest.php
rename to tests/Foundation/Content/Fields/RegistryFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/RoutableFieldTest.php b/tests/Foundation/Content/Fields/RoutableFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/RoutableFieldTest.php
rename to tests/Foundation/Content/Fields/RoutableFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/SlugFieldTest.php b/tests/Foundation/Content/Fields/SlugFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/SlugFieldTest.php
rename to tests/Foundation/Content/Fields/SlugFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/UuidFieldTest.php b/tests/Foundation/Content/Fields/UuidFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/UuidFieldTest.php
rename to tests/Foundation/Content/Fields/UuidFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/VisibilityFieldTest.php b/tests/Foundation/Content/Fields/VisibilityFieldTest.php
similarity index 100%
rename from tests/Foundation/Entries/Fields/VisibilityFieldTest.php
rename to tests/Foundation/Content/Fields/VisibilityFieldTest.php
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/blog/entry.md b/tests/Foundation/Content/Fields/fixtures/content/blog/entry.yaml
similarity index 68%
rename from tests/Foundation/Entries/Fields/fixtures/entries/blog/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/blog/entry.yaml
index 1ac8659d..a81dcc9b 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/blog/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/blog/entry.yaml
@@ -1,9 +1,7 @@
----
 title: blog
 entries:
   fetch:
     posts:
       id: blog
       options:
-        collection: true
----
+        collection: true
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/blog/post-1/entry.md b/tests/Foundation/Content/Fields/fixtures/content/blog/post-1/entry.yaml
similarity index 63%
rename from tests/Foundation/Entries/Fields/fixtures/entries/blog/post-1/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/blog/post-1/entry.yaml
index 3789e730..dd784cf6 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/blog/post-1/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/blog/post-1/entry.yaml
@@ -1,3 +1 @@
----
 title: Post 1
----
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/blog/post-2/entry.md b/tests/Foundation/Content/Fields/fixtures/content/blog/post-2/entry.yaml
similarity index 63%
rename from tests/Foundation/Entries/Fields/fixtures/entries/blog/post-2/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/blog/post-2/entry.yaml
index c940feff..ccf850c9 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/blog/post-2/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/blog/post-2/entry.yaml
@@ -1,3 +1 @@
----
 title: Post 2
----
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/entry.md b/tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/entry.yaml
similarity index 61%
rename from tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/entry.yaml
index a5b36979..eea2139c 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/entry.yaml
@@ -1,3 +1 @@
----
 title: Bikes
----
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/gt/entry.md b/tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/gt/entry.yaml
similarity index 93%
rename from tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/gt/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/gt/entry.yaml
index 21a9123a..cb1117ee 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/gt/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/gt/entry.yaml
@@ -1,4 +1,3 @@
----
 title: GT
 brand: gt
 entries:
@@ -22,5 +21,4 @@ entries:
       id: discounts/30-off
       options:
         filter:
-          limit: 2
----
+          limit: 2
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/norco/entry.md b/tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/norco/entry.yaml
similarity index 83%
rename from tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/norco/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/norco/entry.yaml
index 95630d9b..ebdc2356 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/catalog/bikes/norco/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/catalog/bikes/norco/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Norco
 brand: norco
 entries:
@@ -10,5 +9,4 @@ entries:
     discounts:
       id: discounts
       options:
-        collection: true
----
+        collection: true
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/catalog/entry.md b/tests/Foundation/Content/Fields/fixtures/content/catalog/entry.yaml
similarity index 94%
rename from tests/Foundation/Entries/Fields/fixtures/entries/catalog/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/catalog/entry.yaml
index 567041fe..4ab9a6c2 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/catalog/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/catalog/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Catalog
 visibility: visible
 entries:
@@ -32,5 +31,4 @@ entries:
             -
               key: category
               operator: eq
-              value: bikes
----
+              value: bikes
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/level1/entry.md b/tests/Foundation/Content/Fields/fixtures/content/level1/entry.yaml
similarity index 56%
rename from tests/Foundation/Entries/Fields/fixtures/entries/level1/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/level1/entry.yaml
index bfc83dce..e36d6e12 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/level1/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/level1/entry.yaml
@@ -1,7 +1,5 @@
----
 title: level1
 entries:
   fetch:
     root:
-      id: level1/level2
----
+      id: level1/level2
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/entry.md b/tests/Foundation/Content/Fields/fixtures/content/level1/level2/entry.yaml
similarity index 51%
rename from tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/level1/level2/entry.yaml
index a8d9f057..9c2f9dce 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/level1/level2/entry.yaml
@@ -1,7 +1,5 @@
----
 title: level2
 entries:
   fetch:
     root:
-      id: level1/level2/level3
----
+      id: level1/level2/level3
\ No newline at end of file
diff --git a/tests/Foundation/Content/Fields/fixtures/content/level1/level2/level3/entry.yaml b/tests/Foundation/Content/Fields/fixtures/content/level1/level2/level3/entry.yaml
new file mode 100644
index 00000000..acde5770
--- /dev/null
+++ b/tests/Foundation/Content/Fields/fixtures/content/level1/level2/level3/entry.yaml
@@ -0,0 +1,5 @@
+title: level3
+entries:
+  fetch:
+    root:
+      id: level1/level2/level3/level4
\ No newline at end of file
diff --git a/tests/Foundation/Content/Fields/fixtures/content/level1/level2/level3/level4/entry.yaml b/tests/Foundation/Content/Fields/fixtures/content/level1/level2/level3/level4/entry.yaml
new file mode 100644
index 00000000..0ec38e2f
--- /dev/null
+++ b/tests/Foundation/Content/Fields/fixtures/content/level1/level2/level3/level4/entry.yaml
@@ -0,0 +1 @@
+title: level4
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/macroable/entry.md b/tests/Foundation/Content/Fields/fixtures/content/macroable/entry.yaml
similarity index 78%
rename from tests/Foundation/Entries/Fields/fixtures/entries/macroable/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/macroable/entry.yaml
index 6bfd9449..64ee6267 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/macroable/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/macroable/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Macroable
 entries:
   fetch:
@@ -6,5 +5,4 @@ entries:
       id: table
       options:
         method: fetchExtraData
-        hello: world
----
+        hello: world
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/media/entry.md b/tests/Foundation/Content/Fields/fixtures/content/media/entry.yaml
similarity index 98%
rename from tests/Foundation/Entries/Fields/fixtures/entries/media/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/media/entry.yaml
index c4748411..8b91b7a3 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/media/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/media/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Media
 media:
   folders:
@@ -25,4 +24,3 @@ media:
         id: '/'
         options:
           collection: true
----
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/registry-root/entry.md b/tests/Foundation/Content/Fields/fixtures/content/registry-root/entry.yaml
similarity index 97%
rename from tests/Foundation/Entries/Fields/fixtures/entries/registry-root/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/registry-root/entry.yaml
index 0fdf5479..0103153b 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/registry-root/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/registry-root/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Root
 registry:
   get:
@@ -13,4 +12,3 @@ entries:
     level1:
       id: registry-root/level-1
       result: toArray
----
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/registry-root/level-1/entry.md b/tests/Foundation/Content/Fields/fixtures/content/registry-root/level-1/entry.yaml
similarity index 84%
rename from tests/Foundation/Entries/Fields/fixtures/entries/registry-root/level-1/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/registry-root/level-1/entry.yaml
index 8af694b9..04023ed4 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/registry-root/level-1/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/registry-root/level-1/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Level 1
 entries:
   fetch:
@@ -12,5 +11,4 @@ registry:
     author.name:
       key: flextype.manifest.author.name
     license:
-      key: flextype.manifest.license
----
+      key: flextype.manifest.license
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/registry-root/level-1/level-2/entry.md b/tests/Foundation/Content/Fields/fixtures/content/registry-root/level-1/level-2/entry.yaml
similarity index 77%
rename from tests/Foundation/Entries/Fields/fixtures/entries/registry-root/level-1/level-2/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/registry-root/level-1/level-2/entry.yaml
index 48a5fc19..4ee44e53 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/registry-root/level-1/level-2/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/registry-root/level-1/level-2/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Level 2
 registry:
   get:
@@ -7,5 +6,4 @@ registry:
     author.name:
       key: flextype.manifest.author.name
     license:
-      key: flextype.manifest.license
----
+      key: flextype.manifest.license
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/category-1/album-1/entry.md b/tests/Foundation/Content/Fields/fixtures/content/root/albums/category-1/album-1/entry.yaml
similarity index 91%
rename from tests/Foundation/Entries/Fields/fixtures/entries/root/albums/category-1/album-1/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/root/albums/category-1/album-1/entry.yaml
index ef5b87c8..745c6991 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/category-1/album-1/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/root/albums/category-1/album-1/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Album 1
 entries:
   fetch:
@@ -17,5 +16,4 @@ entries:
         filter:
           limit: 1
         find:
-          depth: ">0"
----
+          depth: ">0"
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/category-1/entry.md b/tests/Foundation/Content/Fields/fixtures/content/root/albums/category-1/entry.yaml
similarity index 68%
rename from tests/Foundation/Entries/Fields/fixtures/entries/root/albums/category-1/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/root/albums/category-1/entry.yaml
index 55e77f02..6257edc8 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/category-1/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/root/albums/category-1/entry.yaml
@@ -1,3 +1 @@
----
 title: Category1
----
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/entry.md b/tests/Foundation/Content/Fields/fixtures/content/root/albums/entry.yaml
similarity index 63%
rename from tests/Foundation/Entries/Fields/fixtures/entries/root/albums/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/root/albums/entry.yaml
index 783ea710..8e696a4f 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/root/albums/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/root/albums/entry.yaml
@@ -1,3 +1 @@
----
 title: Albums
----
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/root/entry.md b/tests/Foundation/Content/Fields/fixtures/content/root/entry.yaml
similarity index 88%
rename from tests/Foundation/Entries/Fields/fixtures/entries/root/entry.md
rename to tests/Foundation/Content/Fields/fixtures/content/root/entry.yaml
index bf99bb42..ae8b52ee 100644
--- a/tests/Foundation/Entries/Fields/fixtures/entries/root/entry.md
+++ b/tests/Foundation/Content/Fields/fixtures/content/root/entry.yaml
@@ -1,4 +1,3 @@
----
 title: Root
 entries:
   fetch:
@@ -13,5 +12,4 @@ entries:
       options:
         collection: false
         find:
-          depth: '>0'
----
+          depth: '>0'
\ No newline at end of file
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/level3/entry.md b/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/level3/entry.md
deleted file mode 100644
index d23c0c21..00000000
--- a/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/level3/entry.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: level3
-entries:
-  fetch:
-    root:
-      id: level1/level2/level3/level4
----
diff --git a/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/level3/level4/entry.md b/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/level3/level4/entry.md
deleted file mode 100644
index 27d64720..00000000
--- a/tests/Foundation/Entries/Fields/fixtures/entries/level1/level2/level3/level4/entry.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: level4
----