diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index fd5305a97..000000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-test/*.conf.js
diff --git a/server/.eslintrc b/.eslintrc.json
similarity index 100%
rename from server/.eslintrc
rename to .eslintrc.json
diff --git a/.gitignore b/.gitignore
index 2209ac81a..b0359459e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-/node_modules
-/npm-debug.log
-/build
-/server/widgets/*.js
-/server/widgets/*.html
+node_modules
+npm-debug.log
+dist
 .DS_Store
-config.json
 *.iml
diff --git a/server/app.js b/app.js
similarity index 100%
rename from server/app.js
rename to app.js
diff --git a/server/bin/www b/bin/www
similarity index 100%
rename from server/bin/www
rename to bin/www
diff --git a/server/mongoose.js b/mongoose.js
similarity index 100%
rename from server/mongoose.js
rename to mongoose.js
diff --git a/package.json b/package.json
index 333f6b98e..422caa613 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,9 @@
   "name": "talk",
   "version": "0.0.1",
   "description": "A commenting platform from The Coral Project. https://coralproject.net",
-  "main": "./server/bin/www",
+  "main": "app.js",
   "scripts": {
-    "start": "./server/bin/www",
+    "start": "./bin/www",
     "lint": "eslint .",
     "test": "mocha"
   },
diff --git a/server/routes/api/comments/index.js b/routes/api/comments/index.js
similarity index 100%
rename from server/routes/api/comments/index.js
rename to routes/api/comments/index.js
diff --git a/server/routes/api/index.js b/routes/api/index.js
similarity index 100%
rename from server/routes/api/index.js
rename to routes/api/index.js