diff --git a/dist/_macros/forms.twig b/dist/_macros/forms.macro.twig
similarity index 100%
rename from dist/_macros/forms.twig
rename to dist/_macros/forms.macro.twig
diff --git a/dist/_patterns/00-atoms/05-forms/00-text-fields.twig b/dist/_patterns/00-atoms/05-forms/00-text-fields.twig
index ef7eef8..02a8485 100644
--- a/dist/_patterns/00-atoms/05-forms/00-text-fields.twig
+++ b/dist/_patterns/00-atoms/05-forms/00-text-fields.twig
@@ -1,4 +1,3 @@
-{% import "@macros/forms.twig" as forms %}
 <fieldset>
     {{ forms.input('Text Input') }}
     {{ forms.input('Password', 'password') }}
diff --git a/dist/_patterns/03-templates/03-article-2col.twig b/dist/_patterns/03-templates/03-article-2col.twig
index a34f775..7ed03b8 100644
--- a/dist/_patterns/03-templates/03-article-2col.twig
+++ b/dist/_patterns/03-templates/03-article-2col.twig
@@ -1,4 +1,4 @@
-{% extends "@templates/page-2col.twig" %}
+{% extends "@templates/00-layouts/01-page-2col.twig" %}
 {% block main %}
     <article class="article">
         <header class="article-header">