diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 00000000..deb30db8
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "refstack-ui/app/assets/lib"
+}
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..8f118fb0
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+refstack-ui/app/assets/lib
\ No newline at end of file
diff --git a/refstack-ui/.eslintrc b/.eslintrc
similarity index 100%
rename from refstack-ui/.eslintrc
rename to .eslintrc
diff --git a/.gitignore b/.gitignore
index 88e7ec67..13820421 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,9 @@ ChangeLog
 build/
 cover/
 dist
+
+.tmp
+node_modules
+npm-debug.log
+refstack-ui/app/assets/lib
+refstack-ui/app/config.json
diff --git a/refstack-ui/bower.json b/bower.json
similarity index 100%
rename from refstack-ui/bower.json
rename to bower.json
diff --git a/refstack-ui/package.json b/package.json
similarity index 69%
rename from refstack-ui/package.json
rename to package.json
index 24513b14..b363dc87 100644
--- a/refstack-ui/package.json
+++ b/package.json
@@ -20,10 +20,10 @@
   "scripts": {
     "postinstall": "bower install --config.interactive=false",
     "prestart": "npm install",
-    "start": "http-server ./app -a 0.0.0.0 -p 8080",
+    "start": "http-server ./refstack-ui/app -a 0.0.0.0 -p 8080",
     "pretest": "npm install",
-    "test": "karma start tests/karma.conf.js",
-    "test-single-run": "karma start tests/karma.conf.js --single-run",
-    "lint": "eslint --no-color ./"
+    "test": "karma start ./refstack-ui/tests/karma.conf.js",
+    "test-single-run": "karma start ./refstack-ui/tests/karma.conf.js --single-run",
+    "lint": "eslint -c ./.eslintrc --no-color ./refstack-ui"
   }
 }
diff --git a/refstack-ui/.bowerrc b/refstack-ui/.bowerrc
deleted file mode 100644
index 5d2a4415..00000000
--- a/refstack-ui/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "directory": "app/assets/lib"
-}
diff --git a/refstack-ui/.eslintignore b/refstack-ui/.eslintignore
deleted file mode 100644
index d8f63b4d..00000000
--- a/refstack-ui/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-app/assets/lib
\ No newline at end of file
diff --git a/refstack-ui/.gitignore b/refstack-ui/.gitignore
deleted file mode 100644
index 1f0fa666..00000000
--- a/refstack-ui/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.tmp
-AUTHORS
-ChangeLog
-build/
-cover/
-dist
-node_modules
-npm-debug.log
-app/assets/lib
-app/config.json