diff --git a/archive.php b/archive.php
index 2095913..c3d30f0 100644
--- a/archive.php
+++ b/archive.php
@@ -34,7 +34,7 @@ get_header(); ?>
                              * If you want to override this in a child theme, then include a file
                              * called content-___.php (where ___ is the Post Format name) and that will be used instead.
                              */
-                            get_template_part( 'content', get_post_format() );
+                            get_template_part( 'loop-templates/content', get_post_format() );
                         ?>
 
                     <?php endwhile; ?>
diff --git a/index.php b/index.php
index b6e52ce..9bf9bd8 100644
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@ get_header(); ?>
                                  * If you want to override this in a child theme, then include a file
                                  * called content-___.php (where ___ is the Post Format name) and that will be used instead.
                                  */
-                                get_template_part( 'content', get_post_format() );
+                                get_template_part( 'loop-templates/content', get_post_format() );
                             ?>
 
                     <?php endwhile; ?>
diff --git a/content-none.php b/loop-templates/content-none.php
similarity index 100%
rename from content-none.php
rename to loop-templates/content-none.php
diff --git a/content-page.php b/loop-templates/content-page.php
similarity index 100%
rename from content-page.php
rename to loop-templates/content-page.php
diff --git a/content-search.php b/loop-templates/content-search.php
similarity index 100%
rename from content-search.php
rename to loop-templates/content-search.php
diff --git a/content-single.php b/loop-templates/content-single.php
similarity index 100%
rename from content-single.php
rename to loop-templates/content-single.php
diff --git a/content.php b/loop-templates/content.php
similarity index 100%
rename from content.php
rename to loop-templates/content.php
diff --git a/page-templates/fullwidthpage.php b/page-templates/fullwidthpage.php
index fa1d4ef..6e815dd 100644
--- a/page-templates/fullwidthpage.php
+++ b/page-templates/fullwidthpage.php
@@ -19,7 +19,7 @@ get_header(); ?>
 
                 <?php while ( have_posts() ) : the_post(); ?>
 
-                    <?php get_template_part( 'content', 'page' ); ?>
+                    <?php get_template_part( 'loop-templates/content', 'page' ); ?>
 
                     <?php
                         // If comments are open or we have at least one comment, load up the comment template
diff --git a/page.php b/page.php
index 3d18a29..1d3a1db 100644
--- a/page.php
+++ b/page.php
@@ -21,7 +21,7 @@ get_header(); ?>
 
                 <?php while ( have_posts() ) : the_post(); ?>
 
-                    <?php get_template_part( 'content', 'page' ); ?>
+                    <?php get_template_part( 'loop-templates/content', 'page' ); ?>
 
                     <?php
                         // If comments are open or we have at least one comment, load up the comment template
diff --git a/search.php b/search.php
index fa6b40d..bf9250e 100644
--- a/search.php
+++ b/search.php
@@ -29,7 +29,7 @@ get_header(); ?>
                      * If you want to overload this in a child theme then include a file
                      * called content-search.php and that will be used instead.
                      */
-                    get_template_part( 'content', 'search' );
+                    get_template_part( 'loop-templates/content', 'search' );
                     ?>
 
                 <?php endwhile; ?>
diff --git a/single.php b/single.php
index bd111b2..69283ac 100644
--- a/single.php
+++ b/single.php
@@ -16,7 +16,7 @@ get_header(); ?>
 
                 <?php while ( have_posts() ) : the_post(); ?>
 
-                    <?php get_template_part( 'content', 'single' ); ?>
+                    <?php get_template_part( 'loop-templates/content', 'single' ); ?>
 
                     <?php understrap_post_nav(); ?>