diff --git a/components/groovy/com/jessebrault/site/CompositionCategory.groovy b/components/groovy/com/jessebrault/site/composition/CompositionCategory.groovy
similarity index 84%
rename from components/groovy/com/jessebrault/site/CompositionCategory.groovy
rename to components/groovy/com/jessebrault/site/composition/CompositionCategory.groovy
index 78d1a0b..7715a9d 100644
--- a/components/groovy/com/jessebrault/site/CompositionCategory.groovy
+++ b/components/groovy/com/jessebrault/site/composition/CompositionCategory.groovy
@@ -1,6 +1,5 @@
-package com.jessebrault.site
+package com.jessebrault.site.composition
 
-import com.jessebrault.site.composition.Composition
 import groowt.view.component.web.BaseWebViewComponent
 
 class CompositionCategory extends BaseWebViewComponent {
diff --git a/components/groovy/com/jessebrault/site/CompositionListing.groovy b/components/groovy/com/jessebrault/site/composition/CompositionListing.groovy
similarity index 82%
rename from components/groovy/com/jessebrault/site/CompositionListing.groovy
rename to components/groovy/com/jessebrault/site/composition/CompositionListing.groovy
index eb4076b..1062236 100644
--- a/components/groovy/com/jessebrault/site/CompositionListing.groovy
+++ b/components/groovy/com/jessebrault/site/composition/CompositionListing.groovy
@@ -1,6 +1,6 @@
-package com.jessebrault.site
+package com.jessebrault.site.composition
+
 
-import com.jessebrault.site.composition.Composition
 import groowt.view.component.web.BaseWebViewComponent
 
 import java.time.format.DateTimeFormatter
diff --git a/components/resources/com/jessebrault/site/CompositionCategoryTemplate.wvc b/components/resources/com/jessebrault/site/composition/CompositionCategoryTemplate.wvc
similarity index 75%
rename from components/resources/com/jessebrault/site/CompositionCategoryTemplate.wvc
rename to components/resources/com/jessebrault/site/composition/CompositionCategoryTemplate.wvc
index f507889..51edb8f 100644
--- a/components/resources/com/jessebrault/site/CompositionCategoryTemplate.wvc
+++ b/components/resources/com/jessebrault/site/composition/CompositionCategoryTemplate.wvc
@@ -1,5 +1,5 @@
 ---
-package com.jessebrault.site
+package com.jessebrault.site.composition
 ---
 <article>
     <h3>$category</h3>
diff --git a/components/resources/com/jessebrault/site/CompositionListingTemplate.wvc b/components/resources/com/jessebrault/site/composition/CompositionListingTemplate.wvc
similarity index 94%
rename from components/resources/com/jessebrault/site/CompositionListingTemplate.wvc
rename to components/resources/com/jessebrault/site/composition/CompositionListingTemplate.wvc
index 5ce3756..5fe5b1f 100644
--- a/components/resources/com/jessebrault/site/CompositionListingTemplate.wvc
+++ b/components/resources/com/jessebrault/site/composition/CompositionListingTemplate.wvc
@@ -1,5 +1,5 @@
 ---
-package com.jessebrault.site
+package com.jessebrault.site.composition
 ---
 <div class="composition-listing">
     <div class="info-row-1">
diff --git a/pages/resources/com/jessebrault/site/CompositionsPageTemplate.wvc b/pages/resources/com/jessebrault/site/CompositionsPageTemplate.wvc
index 0edc296..66e9fc3 100644
--- a/pages/resources/com/jessebrault/site/CompositionsPageTemplate.wvc
+++ b/pages/resources/com/jessebrault/site/CompositionsPageTemplate.wvc
@@ -1,5 +1,7 @@
 ---
 package com.jessebrault.site
+
+import com.jessebrault.site.composition.CompositionCategory
 ---
 <StandardPage title={title}>
     <section>