diff --git a/src/wp-content/themes/twentyseventeen/archive.php b/src/wp-content/themes/twentyseventeen/archive.php
index 6623321353..8aa139f546 100644
--- a/src/wp-content/themes/twentyseventeen/archive.php
+++ b/src/wp-content/themes/twentyseventeen/archive.php
@@ -37,7 +37,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( 'template-parts/post/content', get_post_format() );
+				get_template_part( 'components/post/content', get_post_format() );
 
 			endwhile;
 
@@ -49,7 +49,7 @@ get_header(); ?>
 
 		else :
 
-			get_template_part( 'template-parts/post/content', 'none' );
+			get_template_part( 'components/post/content', 'none' );
 
 		endif; ?>
 
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php b/src/wp-content/themes/twentyseventeen/components/footer/footer-widgets.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php
rename to src/wp-content/themes/twentyseventeen/components/footer/footer-widgets.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/footer/site-info.php b/src/wp-content/themes/twentyseventeen/components/footer/site-info.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/footer/site-info.php
rename to src/wp-content/themes/twentyseventeen/components/footer/site-info.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/header/header-image.php b/src/wp-content/themes/twentyseventeen/components/header/header-image.php
similarity index 79%
rename from src/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
rename to src/wp-content/themes/twentyseventeen/components/header/header-image.php
index 2c4b0f81dc..102456ddcc 100644
--- a/src/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
+++ b/src/wp-content/themes/twentyseventeen/components/header/header-image.php
@@ -17,12 +17,12 @@
 	if ( ! empty( $header_image ) ) : ?>
 
 		<div class="custom-header-image" style="background-image: url(<?php echo esc_url( $header_image ); ?>)"></div>
-		<?php get_template_part( 'template-parts/header/site', 'branding' ); ?>
+		<?php get_template_part( 'components/header/site', 'branding' ); ?>
 
 	<?php else : ?>
 		<?php // Otherwise, show a blank header. ?>
 		<div class="custom-header-simple">
-			<?php get_template_part( 'template-parts/header/site', 'branding' ); ?>
+			<?php get_template_part( 'components/header/site', 'branding' ); ?>
 		</div><!-- .custom-header-simple -->
 
 	<?php endif; ?>
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php b/src/wp-content/themes/twentyseventeen/components/header/site-branding.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
rename to src/wp-content/themes/twentyseventeen/components/header/site-branding.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php b/src/wp-content/themes/twentyseventeen/components/navigation/navigation-top.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php
rename to src/wp-content/themes/twentyseventeen/components/navigation/navigation-top.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php b/src/wp-content/themes/twentyseventeen/components/page/content-front-page-panels.php
similarity index 97%
rename from src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php
rename to src/wp-content/themes/twentyseventeen/components/page/content-front-page-panels.php
index 9e0ffffecb..aa45a2baa3 100644
--- a/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php
+++ b/src/wp-content/themes/twentyseventeen/components/page/content-front-page-panels.php
@@ -73,7 +73,7 @@ global $twentyseventeencounter;
 
 						<?php
 						while ( $recent_posts->have_posts() ) : $recent_posts->the_post();
-							get_template_part( 'template-parts/post/content', 'excerpt' );
+							get_template_part( 'components/post/content', 'excerpt' );
 						endwhile;
 						wp_reset_postdata();
 						?>
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php b/src/wp-content/themes/twentyseventeen/components/page/content-front-page.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php
rename to src/wp-content/themes/twentyseventeen/components/page/content-front-page.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/page/content-page.php b/src/wp-content/themes/twentyseventeen/components/page/content-page.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/page/content-page.php
rename to src/wp-content/themes/twentyseventeen/components/page/content-page.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php b/src/wp-content/themes/twentyseventeen/components/post/content-audio.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
rename to src/wp-content/themes/twentyseventeen/components/post/content-audio.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php b/src/wp-content/themes/twentyseventeen/components/post/content-excerpt.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php
rename to src/wp-content/themes/twentyseventeen/components/post/content-excerpt.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php b/src/wp-content/themes/twentyseventeen/components/post/content-gallery.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php
rename to src/wp-content/themes/twentyseventeen/components/post/content-gallery.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php b/src/wp-content/themes/twentyseventeen/components/post/content-image.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php
rename to src/wp-content/themes/twentyseventeen/components/post/content-image.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php b/src/wp-content/themes/twentyseventeen/components/post/content-none.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
rename to src/wp-content/themes/twentyseventeen/components/post/content-none.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php b/src/wp-content/themes/twentyseventeen/components/post/content-video.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
rename to src/wp-content/themes/twentyseventeen/components/post/content-video.php
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content.php b/src/wp-content/themes/twentyseventeen/components/post/content.php
similarity index 100%
rename from src/wp-content/themes/twentyseventeen/template-parts/post/content.php
rename to src/wp-content/themes/twentyseventeen/components/post/content.php
diff --git a/src/wp-content/themes/twentyseventeen/footer.php b/src/wp-content/themes/twentyseventeen/footer.php
index 2d72029b00..e911c1a7da 100644
--- a/src/wp-content/themes/twentyseventeen/footer.php
+++ b/src/wp-content/themes/twentyseventeen/footer.php
@@ -19,7 +19,7 @@
 	<footer id="colophon" class="site-footer" role="contentinfo">
 		<div class="wrap">
 			<?php
-			get_template_part( 'template-parts/footer/footer', 'widgets' );
+			get_template_part( 'components/footer/footer', 'widgets' );
 
 			if ( has_nav_menu( 'social' ) ) : ?>
 				<nav class="social-navigation" role="navigation" aria-label="<?php _e( 'Footer Social Links Menu', 'twentyseventeen' ); ?>">
@@ -35,7 +35,7 @@
 				</nav><!-- .social-navigation -->
 			<?php endif;
 
-			get_template_part( 'template-parts/footer/site', 'info' );
+			get_template_part( 'components/footer/site', 'info' );
 			?>
 		</div><!-- .wrap -->
 	</footer><!-- #colophon -->
diff --git a/src/wp-content/themes/twentyseventeen/front-page.php b/src/wp-content/themes/twentyseventeen/front-page.php
index 555688857b..ea4ddc996d 100644
--- a/src/wp-content/themes/twentyseventeen/front-page.php
+++ b/src/wp-content/themes/twentyseventeen/front-page.php
@@ -20,10 +20,10 @@ get_header(); ?>
 		<?php // Show the selected frontpage content.
 		if ( have_posts() ) :
 			while ( have_posts() ) : the_post();
-				get_template_part( 'template-parts/page/content', 'front-page' );
+				get_template_part( 'components/page/content', 'front-page' );
 			endwhile;
 		else : // I'm not sure it's possible to have no posts when this page is shown, but WTH.
-			get_template_part( 'template-parts/post/content', 'none' );
+			get_template_part( 'components/post/content', 'none' );
 		endif; ?>
 
 		<?php
@@ -31,7 +31,7 @@ get_header(); ?>
 		$panels = array( '1', '2', '3', '4' );
 		$titles = array();
 
-		global $twentyseventeencounter; // Used in template-parts/page/content-front-page-panels.php file.
+		global $twentyseventeencounter; // Used in components/page/content-front-page-panels.php file.
 
 		if ( 0 !== twentyseventeen_panel_count() || is_customize_preview() ) : // If we have pages to show.
 
@@ -44,7 +44,7 @@ get_header(); ?>
 					set_query_var( 'panel', $panel );
 
 					$titles[] = get_the_title(); // Put page titles in an array for use in navigation.
-					get_template_part( 'template-parts/page/content', 'front-page-panels' );
+					get_template_part( 'components/page/content', 'front-page-panels' );
 
 					wp_reset_postdata();
 				else :
diff --git a/src/wp-content/themes/twentyseventeen/header.php b/src/wp-content/themes/twentyseventeen/header.php
index dc173d67e8..f76bbf379a 100644
--- a/src/wp-content/themes/twentyseventeen/header.php
+++ b/src/wp-content/themes/twentyseventeen/header.php
@@ -28,12 +28,12 @@
 
 	<header id="masthead" class="site-header" role="banner">
 
-		<?php get_template_part( 'template-parts/header/header', 'image' ); ?>
+		<?php get_template_part( 'components/header/header', 'image' ); ?>
 
 		<?php if ( has_nav_menu( 'top' ) ) : ?>
 			<div class="navigation-top">
 				<div class="wrap">
-					<?php get_template_part( 'template-parts/navigation/navigation', 'top' ); ?>
+					<?php get_template_part( 'components/navigation/navigation', 'top' ); ?>
 				</div><!-- .wrap -->
 			</div><!-- .navigation-top -->
 		<?php endif; ?>
diff --git a/src/wp-content/themes/twentyseventeen/index.php b/src/wp-content/themes/twentyseventeen/index.php
index 4e1186bb63..144ef9a4b9 100644
--- a/src/wp-content/themes/twentyseventeen/index.php
+++ b/src/wp-content/themes/twentyseventeen/index.php
@@ -42,7 +42,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( 'template-parts/post/content', get_post_format() );
+					get_template_part( 'components/post/content', get_post_format() );
 
 				endwhile;
 
@@ -54,7 +54,7 @@ get_header(); ?>
 
 			else :
 
-				get_template_part( 'template-parts/post/content', 'none' );
+				get_template_part( 'components/post/content', 'none' );
 
 			endif;
 			?>
diff --git a/src/wp-content/themes/twentyseventeen/page.php b/src/wp-content/themes/twentyseventeen/page.php
index 96211f49dc..850b2ba361 100644
--- a/src/wp-content/themes/twentyseventeen/page.php
+++ b/src/wp-content/themes/twentyseventeen/page.php
@@ -24,7 +24,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) : the_post();
 
-				get_template_part( 'template-parts/page/content', 'page' );
+				get_template_part( 'components/page/content', 'page' );
 
 				// If comments are open or we have at least one comment, load up the comment template.
 				if ( comments_open() || get_comments_number() ) :
diff --git a/src/wp-content/themes/twentyseventeen/search.php b/src/wp-content/themes/twentyseventeen/search.php
index a521e4b58a..6a221817f7 100644
--- a/src/wp-content/themes/twentyseventeen/search.php
+++ b/src/wp-content/themes/twentyseventeen/search.php
@@ -35,7 +35,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( 'template-parts/post/content', 'excerpt' );
+				get_template_part( 'components/post/content', 'excerpt' );
 
 			endwhile; // End of the loop.
 
diff --git a/src/wp-content/themes/twentyseventeen/single.php b/src/wp-content/themes/twentyseventeen/single.php
index 704560b655..f1b3721a47 100644
--- a/src/wp-content/themes/twentyseventeen/single.php
+++ b/src/wp-content/themes/twentyseventeen/single.php
@@ -20,7 +20,7 @@ get_header(); ?>
 				/* Start the Loop */
 				while ( have_posts() ) : the_post();
 
-					get_template_part( 'template-parts/post/content', get_post_format() );
+					get_template_part( 'components/post/content', get_post_format() );
 
 					// If comments are open or we have at least one comment, load up the comment template.
 					if ( comments_open() || get_comments_number() ) :