diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
index be18197e8b..f007fc0d26 100644
--- a/blockbase/inc/block-patterns.php
+++ b/blockbase/inc/block-patterns.php
@@ -52,7 +52,7 @@ function blockbase_register_block_patterns() {
 						'title'      => __( 'Blockbase Header (' . $header_pattern . ')', 'blockbase' ),
 						'categories' => array( 'header' ),
 						'blockTypes' => array( 'core/template-part/header' ),
-						'content'    => file_get_contents (get_theme_file_path( '/block-template-parts/header-' . $header_pattern . '.html' )),
+						'content'    => file_get_contents (get_theme_file_path( '/parts/header-' . $header_pattern . '.html' )),
 					)
 				);
 			}
diff --git a/blockbase/block-template-parts/footer.html b/blockbase/parts/footer.html
similarity index 100%
rename from blockbase/block-template-parts/footer.html
rename to blockbase/parts/footer.html
diff --git a/blockbase/block-template-parts/header-centered.html b/blockbase/parts/header-centered.html
similarity index 100%
rename from blockbase/block-template-parts/header-centered.html
rename to blockbase/parts/header-centered.html
diff --git a/blockbase/block-template-parts/header-default.html b/blockbase/parts/header-default.html
similarity index 100%
rename from blockbase/block-template-parts/header-default.html
rename to blockbase/parts/header-default.html
diff --git a/blockbase/block-template-parts/header-linear.html b/blockbase/parts/header-linear.html
similarity index 100%
rename from blockbase/block-template-parts/header-linear.html
rename to blockbase/parts/header-linear.html
diff --git a/blockbase/block-template-parts/header-minimal.html b/blockbase/parts/header-minimal.html
similarity index 100%
rename from blockbase/block-template-parts/header-minimal.html
rename to blockbase/parts/header-minimal.html
diff --git a/blockbase/block-template-parts/header-rounded-logo.html b/blockbase/parts/header-rounded-logo.html
similarity index 100%
rename from blockbase/block-template-parts/header-rounded-logo.html
rename to blockbase/parts/header-rounded-logo.html
diff --git a/blockbase/block-template-parts/header-wide.html b/blockbase/parts/header-wide.html
similarity index 100%
rename from blockbase/block-template-parts/header-wide.html
rename to blockbase/parts/header-wide.html
diff --git a/blockbase/block-template-parts/header.html b/blockbase/parts/header.html
similarity index 100%
rename from blockbase/block-template-parts/header.html
rename to blockbase/parts/header.html
diff --git a/blockbase/block-template-parts/post-meta-icons.html b/blockbase/parts/post-meta-icons.html
similarity index 100%
rename from blockbase/block-template-parts/post-meta-icons.html
rename to blockbase/parts/post-meta-icons.html
diff --git a/blockbase/block-template-parts/post-meta.html b/blockbase/parts/post-meta.html
similarity index 100%
rename from blockbase/block-template-parts/post-meta.html
rename to blockbase/parts/post-meta.html
diff --git a/blockbase/block-templates/404.html b/blockbase/templates/404.html
similarity index 100%
rename from blockbase/block-templates/404.html
rename to blockbase/templates/404.html
diff --git a/blockbase/block-templates/archive.html b/blockbase/templates/archive.html
similarity index 100%
rename from blockbase/block-templates/archive.html
rename to blockbase/templates/archive.html
diff --git a/blockbase/block-templates/blank.html b/blockbase/templates/blank.html
similarity index 100%
rename from blockbase/block-templates/blank.html
rename to blockbase/templates/blank.html
diff --git a/blockbase/block-templates/footer-only.html b/blockbase/templates/footer-only.html
similarity index 100%
rename from blockbase/block-templates/footer-only.html
rename to blockbase/templates/footer-only.html
diff --git a/blockbase/block-templates/header-footer-only.html b/blockbase/templates/header-footer-only.html
similarity index 100%
rename from blockbase/block-templates/header-footer-only.html
rename to blockbase/templates/header-footer-only.html
diff --git a/blockbase/block-templates/index.html b/blockbase/templates/index.html
similarity index 100%
rename from blockbase/block-templates/index.html
rename to blockbase/templates/index.html
diff --git a/blockbase/block-templates/page.html b/blockbase/templates/page.html
similarity index 100%
rename from blockbase/block-templates/page.html
rename to blockbase/templates/page.html
diff --git a/blockbase/block-templates/search.html b/blockbase/templates/search.html
similarity index 100%
rename from blockbase/block-templates/search.html
rename to blockbase/templates/search.html
diff --git a/blockbase/block-templates/single.html b/blockbase/templates/single.html
similarity index 100%
rename from blockbase/block-templates/single.html
rename to blockbase/templates/single.html