diff --git a/frontend/package.json b/frontend/package.json
index 02fd938b..2afe6697 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -15,7 +15,8 @@
     "test": "make test",
     "open": "nyc report --reporter=html & open coverage/index.html",
     "coverage": "nyc check-coverage --statements 100 --functions 100 --lines 100 --branches 100",
-    "build-locales": " CONFIG=$(pwd)/webpack/index.js NODE_ENV=test babel-node scripts/build-locales"
+    "build-locales": " CONFIG=$(pwd)/webpack/index.js NODE_ENV=test babel-node scripts/build-locales",
+    "clean-static": "git check-ignore static/** | xargs rm"
   },
   "dependencies": {
     "constant-case": "^2.0.0",
diff --git a/ui/package.json b/ui/package.json
index 99c60cdd..39c739ee 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -3,12 +3,13 @@
   "version": "1.0.0",
   "private": true,
   "license": "private",
+  "main": "static/ui",
   "scripts": {
     "start": "webpack-dev-server --config webpack/index.js",
     "lint": "make lint",
     "test": "make test",
     "build": "NODE_ENV=production webpack --config webpack/index.js",
-    "clean-static": "sh scripts/clean-static.sh",
+    "clean-static": "git check-ignore static/** | xargs rm",
     "build-docs-static": "sh scripts/build-docs-static.sh"
   },
   "dependencies": {
diff --git a/ui/scripts/clean-static.sh b/ui/scripts/clean-static.sh
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/static/.gitignore b/ui/static/.gitignore
index d895d0f1..00e3591d 100644
--- a/ui/static/.gitignore
+++ b/ui/static/.gitignore
@@ -2,6 +2,8 @@
 !.gitignore
 !.gitkeep
 !index.html
+!reboot.css
+!theme.css
 
 js/*
 !js/.gitkeep
diff --git a/ui/static/css/.gitignore b/ui/static/css/.gitignore
deleted file mode 100644
index 7629cd5b..00000000
--- a/ui/static/css/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*
-!.gitignore
-!theme.css
-!reboot.css
diff --git a/ui/static/js/.gitkeep b/ui/static/js/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/static/css/reboot.css b/ui/static/reboot.css
similarity index 100%
rename from ui/static/css/reboot.css
rename to ui/static/reboot.css
diff --git a/ui/static/css/theme.css b/ui/static/theme.css
similarity index 100%
rename from ui/static/css/theme.css
rename to ui/static/theme.css