diff --git a/atst/handler.py b/atst/handler.py
index dd151c4c..ba26c885 100644
--- a/atst/handler.py
+++ b/atst/handler.py
@@ -11,7 +11,8 @@ assets = Environment(
 css    = Bundle(
                 'atat.scss',
                 filters = 'scss',
-                output  = '../static/assets/out.css')
+                output  = '../static/assets/out.%(version)s.css',
+                depends = ('**/*.scss'))
 
 assets.register( 'css', css )
 helpers = {
diff --git a/scss/atat.scss b/scss/atat.scss
index afe397c1..85d20bd8 100644
--- a/scss/atat.scss
+++ b/scss/atat.scss
@@ -1,5 +1,5 @@
+@import 'base/variables';
 @import '../node_modules/uswds/src/stylesheets/uswds';
-@import 'variables';
 
 @import 'base/typography';
 @import 'base/forms';
diff --git a/scss/variables.scss b/scss/base/_variables.scss
similarity index 100%
rename from scss/variables.scss
rename to scss/base/_variables.scss