diff --git a/src/scss/_container.scss b/src/scss/components/_container.scss
similarity index 80%
rename from src/scss/_container.scss
rename to src/scss/components/_container.scss
index 81515ab..b56456c 100644
--- a/src/scss/_container.scss
+++ b/src/scss/components/_container.scss
@@ -7,9 +7,10 @@
   margin-right: auto;
   // As soon as the viewport is less than page width plus both gutters,
   // then add gutter spacing to container   
+// TODO: change to media-query helper instead of mq.mq
   @include mq.mq($until: $container-page-width + $gutter * 2) {
-    margin-left: $gutter-half;
-    margin-right: $gutter-half;
+    @include padding-left($gutter-half);
+    @include padding-right($gutter-half);
   }
 }
 // Full width container
@@ -18,5 +19,3 @@
     margin-left: $gutter-half;
     margin-right: $gutter-half;
 }
-
-