diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index 7507f30..0000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"directory": "public/libs"
-}
diff --git a/.travis.yml b/.travis.yml
index adc9d44..1fd6c40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: node_js
 node_js:
-- '0.10'
+- '0.12'
 services:
 - mongodb
 env:
   global:
     secure: G2F3So5W3+ieJxP7+wpWO+MLCrXd7E3TL/qmvRIuASV9SEgJp76Qe5gBuu6QkVkMQaYZqOJTd9MW96Pm2NABqfE2xaojv3za4n/IqeyHpjSi9/Sg3PAABLqQ2/izpBYWcxtiZxtElLhSksGr9qDcj9OnIodogvNiXacaS9YKWwHF2eBO+Z3xQYfjh+jGrY2/gW6TzY+3BVOWoOspUrKNuWT74lxoz+smxVygYtzb5tGINvswj9gpZOCrvDms/E40ksm0mOSFAmNbK6/RasiKncqrd2dB0sgF0/LvoyDYJv6ozpDMkOfG5GVIuoc6DiK3txejlIW6HWyOxzzMItDk5pVIqSAoCAgSzjsti/kvIcy7mfSrZwEAyrqBrzCMs9rxXvNyX1k4etykqwCkA0dpbed2NgNnaUyMlpcObkiodt8xGIzddErLKemCVBhmFi1NxCe6vCOiArsMtqrkJkccDeVILTyKNo/vVCzO3vBLbmvUkbyucJRxD5J9plgleZVtOm6yE4Lm6343zvp7aVBcZZGGmZwf34vS/sJ5mfmxpm7h30SkUB8hHezXPPa6HTlOPeVaatw/QodX1KyNtHB1n4BxOMHjUZcIDHdcRwNS/K4/5Fv+VvFdnSve+AWTiEMC4Ux6SixuNaHtg5syW/JVVVhcRPqyuxSpGI+oupvXAxg=
 after_success:
-  - 'curl "http://technical.viadeo-playground.com/deploy/update?secret_key=$PASSWORD&site=cloudbudget"'
-  - 'cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js'
\ No newline at end of file
+  - 'cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js'
+  - 'curl "http://technical.viadeo-playground.com/deploy/update?secret_key=$PASSWORD&site=cloudbudget"'
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..780a159
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,8 @@
+Cloud Budget
+Copyright 2015 Febbweiss
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index c8061fe..aa76d2f 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,11 @@
-Work in progress [![Build Status](https://travis-ci.org/Febbweiss/CloudBudget.svg?branch=master)](https://travis-ci.org/Febbweiss/CloudBudget) [![Coverage Status](https://coveralls.io/repos/Febbweiss/CloudBudget/badge.svg?branch=master&service=github)](https://coveralls.io/github/Febbweiss/CloudBudget?branch=master)
\ No newline at end of file
+Work in progress 
+[![Build Status][build-image]][build-url]
+[![Coverage Status][coverage-image]][coverage-url]
+[![License][license-image]][license-url]
+
+[build-image]: https://travis-ci.org/Febbweiss/CloudBudget.svg?branch=master
+[build-url]: https://travis-ci.org/Febbweiss/CloudBudget
+[coverage-image]:https://coveralls.io/repos/Febbweiss/CloudBudget/badge.svg?branch=master&service=github
+[coverage-url]: https://coveralls.io/github/Febbweiss/CloudBudget?branch=master
+[license-image]: https://img.shields.io/badge/LICENSE-MIT-blue.svg
+[license-url]: LICENSE
\ No newline at end of file
diff --git a/app/routes.js b/app/routes.js
index de06f20..53272c1 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -11,6 +11,6 @@ module.exports = function(app) {
     })
     
      app.get('*', function(req, res) {
-        res.sendfile('./public/views/index.html');
+        res.sendfile('./public/index.html');
     });
 };
\ No newline at end of file
diff --git a/bower.json b/bower.json
deleted file mode 100644
index 069128d..0000000
--- a/bower.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "name": "cloud-budget",
-    "version": "1.0.0-SNAPSHOT",
-    "dependencies": {
-        "bootstrap": "~3.3.5",
-        "font-awesome": "~4.3.0",
-        "animate.css": "~3.3.0",
-        "angular": "~1.4.1",
-        "angular-route": "~1.4.1"
-    }
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index b29d382..0775cc8 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,14 @@
 {
   "name": "cloud-budget",
   "main": "app.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Febbweiss/CloudBudget"
+  },
+  "bugs" : {
+    "url": "https://github.com/Febbweiss/CloudBudget/issues"
+  },
   "dependencies": {
-    "bower": "~1.5.1",
     "express": "~4.5.1",
     "mongoose": "~4.0.8",
     "body-parser": "~1.4.2",
@@ -17,6 +23,7 @@
     "passport-jwt": "~1.1.0"
   },
   "devDependencies": {
+    "chai": "^3.2.0",
     "coveralls": "^2.11.4",
     "istanbul": "^0.3.18",
     "mocha": "~2.2.5",
@@ -29,5 +36,6 @@
     "test": "NODE_ENV=test ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec test/*",
     "start": "app.js",
     "stop": "pkill -SIGINT CloudBudget"
-  }
+  },
+  "license": "MIT"
 }
diff --git a/public/index.html b/public/index.html
new file mode 100644
index 0000000..8701cb7
--- /dev/null
+++ b/public/index.html
@@ -0,0 +1,4 @@
+<html>
+    <head></head>
+    <body>Work in progress</body>
+</html>
\ No newline at end of file
diff --git a/public/views/index.html b/public/views/index.html
deleted file mode 100644
index dcc323b..0000000
--- a/public/views/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <base href="/" />
-        
-        <title>MEAN Demo Single Page Application</title>
-        
-        <link rel="stylesheet" href="libs/bootstrap/dist/css/bootstrap.min.css" />
-        <link rel="stylesheet" href="css/style.css" />
-        
-        
-        <script src="libs/angular/angular.min.js" ></script>
-        <script src="libs/angular-route/angular-route.min.js" ></script>
-        
-        <script src="js/controllers/MainCtrl.js"></script>
-        <script src="js/controllers/NerdCtrl.js"></script>
-        <script src="js/services/NerdService.js"></script>
-        <script src="js/appRoutes.js"></script>
-        <script src="js/app.js"></script>
-    </head>
-    
-    <body ng-app="sampleApp" ng-controller="NerdController">
-        <div class="container">
-            <nav class="navbar navbar-inverse">
-                <div class="navbar-header">
-                    <a class="navbar-brand" href="/">MEAN-Demo</a>
-                </div>
-                
-                <ul class="nav navbar-nav">
-                    <li><a href="/nerds">Nerds</a></li>                    
-                </ul>
-            </nav>
-            
-            <div ng-view></div>
-            
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/public/views/user.html b/public/views/user.html
deleted file mode 100644
index e69de29..0000000
diff --git a/test/server/accounts.js b/test/accounts.js
similarity index 99%
rename from test/server/accounts.js
rename to test/accounts.js
index 7580f64..b3f2d57 100644
--- a/test/server/accounts.js
+++ b/test/accounts.js
@@ -1,6 +1,6 @@
 var should      = require('should'), 
     request     = require('supertest'),
-    app         = require('../../server.js'),
+    app         = require('../server.js'),
     Db          = require('./db.js'),
     globalServer, token, hacker_token, account_id;
 
diff --git a/test/server/db.js b/test/db.js
similarity index 98%
rename from test/server/db.js
rename to test/db.js
index aebfa20..11fe873 100644
--- a/test/server/db.js
+++ b/test/db.js
@@ -1,6 +1,6 @@
 var mongoose    = require('mongoose'),
     jwt         = require('jsonwebtoken'),
-    security    = require('../../config/security');
+    security    = require('../config/security');
     
 
 var USER_ID = '55c9e2e3d300cc798928cc87',
diff --git a/test/server/server.js b/test/server.js
similarity index 92%
rename from test/server/server.js
rename to test/server.js
index e1c1d2d..6b5c6f0 100644
--- a/test/server/server.js
+++ b/test/server.js
@@ -1,6 +1,6 @@
 var should = require('should'), 
     request = require('supertest'),
-    app  = require('../../server.js'),
+    app  = require('../server.js'),
     globalServer;
 
 describe('Static resources', function(){
diff --git a/test/server/users.js b/test/users.js
similarity index 98%
rename from test/server/users.js
rename to test/users.js
index 63bba7e..cad7dd7 100644
--- a/test/server/users.js
+++ b/test/users.js
@@ -1,11 +1,11 @@
 var should          = require('should'), 
     request         = require('supertest'),
-    app             = require('../../server.js'),
+    app             = require('../server.js'),
     mongoose        = require('mongoose'),
     User            = mongoose.model('User'),
     Db              = require('./db.js'),
     sinon           = require('sinon'),
-    EventEmitter    = require('../../app/events/listeners'),
+    EventEmitter    = require('../app/events/listeners'),
     globalServer, token, hacker_token, account_id, user_id;
 
 describe('API /users', function() {