diff --git a/arbutus/block-template-parts/footer.html b/arbutus/parts/footer.html
similarity index 100%
rename from arbutus/block-template-parts/footer.html
rename to arbutus/parts/footer.html
diff --git a/arbutus/block-template-parts/header.html b/arbutus/parts/header.html
similarity index 100%
rename from arbutus/block-template-parts/header.html
rename to arbutus/parts/header.html
diff --git a/arbutus/block-templates/header-footer-only.html b/arbutus/templates/header-footer-only.html
similarity index 100%
rename from arbutus/block-templates/header-footer-only.html
rename to arbutus/templates/header-footer-only.html
diff --git a/arbutus/block-templates/index.html b/arbutus/templates/index.html
similarity index 100%
rename from arbutus/block-templates/index.html
rename to arbutus/templates/index.html
diff --git a/arbutus/block-templates/page.html b/arbutus/templates/page.html
similarity index 100%
rename from arbutus/block-templates/page.html
rename to arbutus/templates/page.html
diff --git a/arbutus/block-templates/single.html b/arbutus/templates/single.html
similarity index 100%
rename from arbutus/block-templates/single.html
rename to arbutus/templates/single.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.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/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
diff --git a/geologist/block-template-parts/footer.html b/geologist/parts/footer.html
similarity index 100%
rename from geologist/block-template-parts/footer.html
rename to geologist/parts/footer.html
diff --git a/geologist/block-template-parts/header.html b/geologist/parts/header.html
similarity index 100%
rename from geologist/block-template-parts/header.html
rename to geologist/parts/header.html
diff --git a/geologist/block-template-parts/post-meta.html b/geologist/parts/post-meta.html
similarity index 100%
rename from geologist/block-template-parts/post-meta.html
rename to geologist/parts/post-meta.html
diff --git a/geologist/block-templates/index.html b/geologist/templates/index.html
similarity index 100%
rename from geologist/block-templates/index.html
rename to geologist/templates/index.html
diff --git a/geologist/block-templates/page-without-title.html b/geologist/templates/page-without-title.html
similarity index 100%
rename from geologist/block-templates/page-without-title.html
rename to geologist/templates/page-without-title.html
diff --git a/geologist/block-templates/page.html b/geologist/templates/page.html
similarity index 100%
rename from geologist/block-templates/page.html
rename to geologist/templates/page.html
diff --git a/geologist/block-templates/search.html b/geologist/templates/search.html
similarity index 100%
rename from geologist/block-templates/search.html
rename to geologist/templates/search.html
diff --git a/geologist/block-templates/single.html b/geologist/templates/single.html
similarity index 100%
rename from geologist/block-templates/single.html
rename to geologist/templates/single.html
diff --git a/ibis/block-template-parts/footer.html b/ibis/parts/footer.html
similarity index 100%
rename from ibis/block-template-parts/footer.html
rename to ibis/parts/footer.html
diff --git a/ibis/block-template-parts/header.html b/ibis/parts/header.html
similarity index 100%
rename from ibis/block-template-parts/header.html
rename to ibis/parts/header.html
diff --git a/ibis/block-templates/index.html b/ibis/templates/index.html
similarity index 100%
rename from ibis/block-templates/index.html
rename to ibis/templates/index.html
diff --git a/ibis/block-templates/singular.html b/ibis/templates/singular.html
similarity index 100%
rename from ibis/block-templates/singular.html
rename to ibis/templates/singular.html
diff --git a/kerr/block-template-parts/header.html b/kerr/parts/header.html
similarity index 100%
rename from kerr/block-template-parts/header.html
rename to kerr/parts/header.html
diff --git a/kerr/block-templates/index.html b/kerr/templates/index.html
similarity index 100%
rename from kerr/block-templates/index.html
rename to kerr/templates/index.html
diff --git a/kerr/block-templates/single.html b/kerr/templates/single.html
similarity index 100%
rename from kerr/block-templates/single.html
rename to kerr/templates/single.html
diff --git a/mayland-blocks/block-template-parts/footer.html b/mayland-blocks/parts/footer.html
similarity index 100%
rename from mayland-blocks/block-template-parts/footer.html
rename to mayland-blocks/parts/footer.html
diff --git a/mayland-blocks/block-template-parts/header.html b/mayland-blocks/parts/header.html
similarity index 100%
rename from mayland-blocks/block-template-parts/header.html
rename to mayland-blocks/parts/header.html
diff --git a/mayland-blocks/block-template-parts/post-meta.html b/mayland-blocks/parts/post-meta.html
similarity index 100%
rename from mayland-blocks/block-template-parts/post-meta.html
rename to mayland-blocks/parts/post-meta.html
diff --git a/mayland-blocks/block-templates/front-page.html b/mayland-blocks/templates/front-page.html
similarity index 100%
rename from mayland-blocks/block-templates/front-page.html
rename to mayland-blocks/templates/front-page.html
diff --git a/mayland-blocks/block-templates/index.html b/mayland-blocks/templates/index.html
similarity index 100%
rename from mayland-blocks/block-templates/index.html
rename to mayland-blocks/templates/index.html
diff --git a/mayland-blocks/block-templates/page.html b/mayland-blocks/templates/page.html
similarity index 100%
rename from mayland-blocks/block-templates/page.html
rename to mayland-blocks/templates/page.html
diff --git a/mayland-blocks/block-templates/single.html b/mayland-blocks/templates/single.html
similarity index 100%
rename from mayland-blocks/block-templates/single.html
rename to mayland-blocks/templates/single.html
diff --git a/payton/block-template-parts/footer.html b/payton/parts/footer.html
similarity index 100%
rename from payton/block-template-parts/footer.html
rename to payton/parts/footer.html
diff --git a/payton/block-template-parts/header.html b/payton/parts/header.html
similarity index 100%
rename from payton/block-template-parts/header.html
rename to payton/parts/header.html
diff --git a/payton/block-templates/header-footer-only.html b/payton/templates/header-footer-only.html
similarity index 100%
rename from payton/block-templates/header-footer-only.html
rename to payton/templates/header-footer-only.html
diff --git a/payton/block-templates/index.html b/payton/templates/index.html
similarity index 100%
rename from payton/block-templates/index.html
rename to payton/templates/index.html
diff --git a/payton/block-templates/page.html b/payton/templates/page.html
similarity index 100%
rename from payton/block-templates/page.html
rename to payton/templates/page.html
diff --git a/payton/block-templates/single.html b/payton/templates/single.html
similarity index 100%
rename from payton/block-templates/single.html
rename to payton/templates/single.html
diff --git a/quadrat/block-template-parts/footer.html b/quadrat/parts/footer.html
similarity index 100%
rename from quadrat/block-template-parts/footer.html
rename to quadrat/parts/footer.html
diff --git a/quadrat/block-template-parts/header.html b/quadrat/parts/header.html
similarity index 100%
rename from quadrat/block-template-parts/header.html
rename to quadrat/parts/header.html
diff --git a/quadrat/block-templates/index.html b/quadrat/templates/index.html
similarity index 100%
rename from quadrat/block-templates/index.html
rename to quadrat/templates/index.html
diff --git a/quadrat/block-templates/page-without-title.html b/quadrat/templates/page-without-title.html
similarity index 100%
rename from quadrat/block-templates/page-without-title.html
rename to quadrat/templates/page-without-title.html
diff --git a/quadrat/block-templates/page.html b/quadrat/templates/page.html
similarity index 100%
rename from quadrat/block-templates/page.html
rename to quadrat/templates/page.html
diff --git a/quadrat/block-templates/search.html b/quadrat/templates/search.html
similarity index 100%
rename from quadrat/block-templates/search.html
rename to quadrat/templates/search.html
diff --git a/quadrat/block-templates/single.html b/quadrat/templates/single.html
similarity index 100%
rename from quadrat/block-templates/single.html
rename to quadrat/templates/single.html
diff --git a/russell/block-template-parts/header.html b/russell/parts/header.html
similarity index 100%
rename from russell/block-template-parts/header.html
rename to russell/parts/header.html
diff --git a/russell/block-template-parts/post-meta.html b/russell/parts/post-meta.html
similarity index 100%
rename from russell/block-template-parts/post-meta.html
rename to russell/parts/post-meta.html
diff --git a/russell/block-templates/blank.html b/russell/templates/blank.html
similarity index 100%
rename from russell/block-templates/blank.html
rename to russell/templates/blank.html
diff --git a/russell/block-templates/header-footer-only.html b/russell/templates/header-footer-only.html
similarity index 100%
rename from russell/block-templates/header-footer-only.html
rename to russell/templates/header-footer-only.html
diff --git a/russell/block-templates/index.html b/russell/templates/index.html
similarity index 100%
rename from russell/block-templates/index.html
rename to russell/templates/index.html
diff --git a/russell/block-templates/page.html b/russell/templates/page.html
similarity index 100%
rename from russell/block-templates/page.html
rename to russell/templates/page.html
diff --git a/russell/block-templates/search.html b/russell/templates/search.html
similarity index 100%
rename from russell/block-templates/search.html
rename to russell/templates/search.html
diff --git a/russell/block-templates/single.html b/russell/templates/single.html
similarity index 100%
rename from russell/block-templates/single.html
rename to russell/templates/single.html
diff --git a/seedlet-blocks/block-template-parts/footer.html b/seedlet-blocks/parts/footer.html
similarity index 100%
rename from seedlet-blocks/block-template-parts/footer.html
rename to seedlet-blocks/parts/footer.html
diff --git a/seedlet-blocks/block-template-parts/header.html b/seedlet-blocks/parts/header.html
similarity index 100%
rename from seedlet-blocks/block-template-parts/header.html
rename to seedlet-blocks/parts/header.html
diff --git a/seedlet-blocks/block-template-parts/post-meta.html b/seedlet-blocks/parts/post-meta.html
similarity index 100%
rename from seedlet-blocks/block-template-parts/post-meta.html
rename to seedlet-blocks/parts/post-meta.html
diff --git a/seedlet-blocks/block-templates/index.html b/seedlet-blocks/templates/index.html
similarity index 100%
rename from seedlet-blocks/block-templates/index.html
rename to seedlet-blocks/templates/index.html
diff --git a/seedlet-blocks/block-templates/singular.html b/seedlet-blocks/templates/singular.html
similarity index 100%
rename from seedlet-blocks/block-templates/singular.html
rename to seedlet-blocks/templates/singular.html
diff --git a/skatepark/block-template-parts/footer.html b/skatepark/parts/footer.html
similarity index 100%
rename from skatepark/block-template-parts/footer.html
rename to skatepark/parts/footer.html
diff --git a/skatepark/block-template-parts/header.html b/skatepark/parts/header.html
similarity index 100%
rename from skatepark/block-template-parts/header.html
rename to skatepark/parts/header.html
diff --git a/skatepark/block-templates/404.html b/skatepark/templates/404.html
similarity index 100%
rename from skatepark/block-templates/404.html
rename to skatepark/templates/404.html
diff --git a/skatepark/block-templates/index.html b/skatepark/templates/index.html
similarity index 100%
rename from skatepark/block-templates/index.html
rename to skatepark/templates/index.html
diff --git a/skatepark/block-templates/page.html b/skatepark/templates/page.html
similarity index 100%
rename from skatepark/block-templates/page.html
rename to skatepark/templates/page.html
diff --git a/skatepark/block-templates/search.html b/skatepark/templates/search.html
similarity index 100%
rename from skatepark/block-templates/search.html
rename to skatepark/templates/search.html
diff --git a/skatepark/block-templates/single.html b/skatepark/templates/single.html
similarity index 100%
rename from skatepark/block-templates/single.html
rename to skatepark/templates/single.html
diff --git a/videomaker/block-template-parts/footer.html b/videomaker/parts/footer.html
similarity index 100%
rename from videomaker/block-template-parts/footer.html
rename to videomaker/parts/footer.html
diff --git a/videomaker/block-template-parts/header.html b/videomaker/parts/header.html
similarity index 100%
rename from videomaker/block-template-parts/header.html
rename to videomaker/parts/header.html
diff --git a/videomaker/block-templates/404.html b/videomaker/templates/404.html
similarity index 100%
rename from videomaker/block-templates/404.html
rename to videomaker/templates/404.html
diff --git a/videomaker/block-templates/blank.html b/videomaker/templates/blank.html
similarity index 100%
rename from videomaker/block-templates/blank.html
rename to videomaker/templates/blank.html
diff --git a/videomaker/block-templates/header-footer-only.html b/videomaker/templates/header-footer-only.html
similarity index 100%
rename from videomaker/block-templates/header-footer-only.html
rename to videomaker/templates/header-footer-only.html
diff --git a/videomaker/block-templates/index.html b/videomaker/templates/index.html
similarity index 100%
rename from videomaker/block-templates/index.html
rename to videomaker/templates/index.html
diff --git a/videomaker/block-templates/page.html b/videomaker/templates/page.html
similarity index 100%
rename from videomaker/block-templates/page.html
rename to videomaker/templates/page.html
diff --git a/videomaker/block-templates/search.html b/videomaker/templates/search.html
similarity index 100%
rename from videomaker/block-templates/search.html
rename to videomaker/templates/search.html
diff --git a/videomaker/block-templates/single.html b/videomaker/templates/single.html
similarity index 100%
rename from videomaker/block-templates/single.html
rename to videomaker/templates/single.html
diff --git a/zoologist/block-template-parts/footer.html b/zoologist/parts/footer.html
similarity index 100%
rename from zoologist/block-template-parts/footer.html
rename to zoologist/parts/footer.html
diff --git a/zoologist/block-template-parts/header.html b/zoologist/parts/header.html
similarity index 100%
rename from zoologist/block-template-parts/header.html
rename to zoologist/parts/header.html
diff --git a/zoologist/block-template-parts/post-meta.html b/zoologist/parts/post-meta.html
similarity index 100%
rename from zoologist/block-template-parts/post-meta.html
rename to zoologist/parts/post-meta.html
diff --git a/zoologist/block-templates/index.html b/zoologist/templates/index.html
similarity index 100%
rename from zoologist/block-templates/index.html
rename to zoologist/templates/index.html
diff --git a/zoologist/block-templates/page-without-title.html b/zoologist/templates/page-without-title.html
similarity index 100%
rename from zoologist/block-templates/page-without-title.html
rename to zoologist/templates/page-without-title.html
diff --git a/zoologist/block-templates/page.html b/zoologist/templates/page.html
similarity index 100%
rename from zoologist/block-templates/page.html
rename to zoologist/templates/page.html
diff --git a/zoologist/block-templates/search.html b/zoologist/templates/search.html
similarity index 100%
rename from zoologist/block-templates/search.html
rename to zoologist/templates/search.html
diff --git a/zoologist/block-templates/single.html b/zoologist/templates/single.html
similarity index 100%
rename from zoologist/block-templates/single.html
rename to zoologist/templates/single.html