diff --git a/web/.meteor/.finished-upgraders b/.meteor/.finished-upgraders
similarity index 100%
rename from web/.meteor/.finished-upgraders
rename to .meteor/.finished-upgraders
diff --git a/web/.meteor/.gitignore b/.meteor/.gitignore
similarity index 100%
rename from web/.meteor/.gitignore
rename to .meteor/.gitignore
diff --git a/web/.meteor/.id b/.meteor/.id
similarity index 100%
rename from web/.meteor/.id
rename to .meteor/.id
diff --git a/web/.meteor/cordova-plugins b/.meteor/cordova-plugins
similarity index 100%
rename from web/.meteor/cordova-plugins
rename to .meteor/cordova-plugins
diff --git a/web/.meteor/packages b/.meteor/packages
similarity index 100%
rename from web/.meteor/packages
rename to .meteor/packages
diff --git a/web/.meteor/platforms b/.meteor/platforms
similarity index 100%
rename from web/.meteor/platforms
rename to .meteor/platforms
diff --git a/web/.meteor/release b/.meteor/release
similarity index 100%
rename from web/.meteor/release
rename to .meteor/release
diff --git a/web/.meteor/versions b/.meteor/versions
similarity index 100%
rename from web/.meteor/versions
rename to .meteor/versions
diff --git a/README.md b/README.md
index 8a5cc68..1f056d9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 hckrs.io ![hckrs icon](https://s3.amazonaws.com/hckrs.io/static/logo/logo-icon-vector-mini.png)
 =========
 
-[**hckrs.io**](http://hckrs.io) is an invite only platform for hackers; for basicly anyone who has to make stuff, somehow related to technology. ***#web #design #growth #hardware #life...***  
+[**hckrs.io**](http://hckrs.io) is an invite only platform for hackers; for basicly anyone who has to make stuff, somehow related to technology. ***#web #design #growth #hardware #life...***
 [**Join your local city**](http://hckrs.io) to see it in action. *(Europe only for now)*
 
 <a href="http://hckrs.io"><img src="https://s3.amazonaws.com/hckrs.io/static/preview/preview1.jpg" alt="Screenshot hckrs.io" ></a>
@@ -18,8 +18,8 @@ Get you hacking
 ######1. [Download](https://github.com/Jarnoleconte/hckrs.io/archive/development.zip) / clone this repo.
 ######2. Go to the ***hckrs*** folder in your terminal.
 ######3. Install dependencies: `source ./tools/install.sh`
-######4. Move to the project `cd web` and startup a local server `hckrs run`
-######5. Open [http://localhost:3000](http://localhost:3000) in your browser and login with ***Twitter*** ([why?](https://github.com/Jarnoleconte/hckrs.io/wiki/Run-Project#login-at-the-site)) 
+######4. Start up a local server `hckrs run`
+######5. Open [http://localhost:3000](http://localhost:3000) in your browser and login with ***Twitter*** ([why?](https://github.com/Jarnoleconte/hckrs.io/wiki/Run-Project#login-at-the-site))
 
 *Support for* ***OS X*** *and* ***Linux*** *right now.*
 *Meteor has no solid support for windows yet.*
@@ -27,7 +27,7 @@ Get you hacking
 
 
 
-Roadmap 
+Roadmap
 --------
 
 * Subcultures with meetups
@@ -49,10 +49,10 @@ Roadmap
 Documentation
 --------------
 
-Read the [wiki](https://github.com/Jarnoleconte/hckrs.io/wiki) to get understanding of the project structure.  
+Read the [wiki](https://github.com/Jarnoleconte/hckrs.io/wiki) to get understanding of the project structure.
 
-Techniqual documentation is available during development.  
-Start up a local server and navigate in your browser to:  
+Techniqual documentation is available during development.
+Start up a local server and navigate in your browser to:
 [http://localhost:3000/docs](http://localhost:3000/docs)
 
 
@@ -67,7 +67,7 @@ Partners in crime
 The [hckrs.io](http://hckrs.io) core team is open.
 
 Toon | Jarno | Daan | Daniël | Steven
-:---:|:-----:|:----:|:------:|:------: 
+:---:|:-----:|:----:|:------:|:------:
 <a href="https://github.com/ramshorst"><img src="https://avatars0.githubusercontent.com/u/5200239?v=3&s=80" width="80" alt="Toon van Ramshorst" style="width:80px;height:80px;border-radius: 40px;"></a> | <a href="https://github.com/Jarnoleconte"><img src="https://avatars0.githubusercontent.com/u/279767?v=3&s=80" alt="Jarno Le Conté" width="80" style="width:80px;height:80px;border-radius: 40px;"></a> | <a href="https://github.com/daanvr"><img src="https://avatars0.githubusercontent.com/u/4609765?v=3&s=80" alt="Daan van Ramshorst" width="80" style="width:80px;height:80px;border-radius: 40px;"></a> | <a href="https://github.com/Dandandan"><img src="https://avatars0.githubusercontent.com/u/163737?v=3&s=80" alt="Daniël Heres" width="80" style="width:80px;height:80px;border-radius: 40px;"></a> | <a href="https://github.com/Mellowlicious"><img src="https://avatars0.githubusercontent.com/u/8102336?v=3&s=80" alt="Steven den Hartog" width="80" style="width:80px;height:80px;border-radius: 40px;"></a>
 co-founder | lead-dev | growth | core-dev | core-dev
 
@@ -75,11 +75,11 @@ co-founder | lead-dev | growth | core-dev | core-dev
 Getting involved?
 ------------------
 
-No need to be a developer to contribute. We have ambitous plans that require all kinds of skills, you may be good in ***video, story telling, copywriting, blogging, interviewing/podcasting, mobile apps, events, curation, hackatons, recruitment***. 
+No need to be a developer to contribute. We have ambitous plans that require all kinds of skills, you may be good in ***video, story telling, copywriting, blogging, interviewing/podcasting, mobile apps, events, curation, hackatons, recruitment***.
 
 We are looking for people that make things happen. (**BAM!**)
 
-It's also okay to just start developing (making changes to this repo). Feel free to work on issues or add your own. Do a pull request when you are done. 
+It's also okay to just start developing (making changes to this repo). Feel free to work on issues or add your own. Do a pull request when you are done.
 
 **GO!**
 
diff --git a/web/Routes.js b/Routes.js
similarity index 84%
rename from web/Routes.js
rename to Routes.js
index 06baebc..ccd0b04 100644
--- a/web/Routes.js
+++ b/Routes.js
@@ -116,7 +116,6 @@ FrontpageController = DefaultController.extend({
   template: 'frontpage',
   waitOn: function() {
     return [
-      Meteor.subscribe('currentUser'),
       Meteor.subscribe('staff'),
       Meteor.subscribe('ambassadors')
     ];
@@ -131,20 +130,14 @@ FrontpageController = DefaultController.extend({
 AgendaController = DefaultController.extend({
   template: 'agenda',
   waitOn: function () {
-    return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('users') // XXX be more precise
-    ];
+    return [];
   }
 });
 
 BooksController = DefaultController.extend({
   template: 'books',
   waitOn: function () {
-    return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('users') // XXX be more precise
-    ];
+    return [];
   }
 });
 
@@ -152,13 +145,11 @@ DealsController = DefaultController.extend({
   template: 'deals',
   waitOn: function () {
     var city = Url.city();
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('users') // XXX be more precise
-    ].concat(!city ? [] : [
       Meteor.subscribe('deals', city),
       Meteor.subscribe('dealsSort', city)
-    ]);
+    ];
   }
 });
 
@@ -166,16 +157,15 @@ HackerController = DefaultController.extend({
   template: 'hacker',
   waitOn: function () {
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('users') // XXX be more precise
+      Meteor.subscribe('userByBitHash', this.params.bitHash)
     ];
   },
   onBeforeAction: function() {
-    if (this.ready() && !this.initialized) {
+    if (this.ready()) {
       var userId = (Users.userForBitHash(this.params.bitHash) || {})._id;
       Session.set('hackerId', userId);
-      Session.set('hackerEditMode', Users.myProp('isAccessDenied'));
-      this.initialized = true;
+      if (Users.myProp('isAccessDenied'))
+        Session.set('hackerEditMode', true);
     }
     this.next();
   }
@@ -184,10 +174,12 @@ HackerController = DefaultController.extend({
 HackersController = DefaultController.extend({
   template: 'hackers',
   waitOn: function () {
+    var city = Url.city();
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
       Meteor.subscribe('invitations'),
-      Meteor.subscribe('users') // XXX be more precise
+      Meteor.subscribe('usersOfCity', city),
+      Meteor.subscribe('usersInvitedByUser', Meteor.userId())
     ];
   }
 });
@@ -197,13 +189,12 @@ HighlightsController = DefaultController.extend({
   template: 'highlights',
   waitOn: function() {
     var city = Url.city();
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('users') // XXX be more precise
-    ].concat(!city ? [] : [
+      Meteor.subscribe('usersOfHighlightsOfCity', city),
       Meteor.subscribe('highlights', city),
       Meteor.subscribe('highlightsSort', city)
-    ]);
+    ];
   },
   onBeforeAction: function() {
     var city = Session.get('currentCity');
@@ -224,10 +215,11 @@ HighlightsController = DefaultController.extend({
 InvitationsController = DefaultController.extend({
   template: 'invitations',
   waitOn: function () {
+    var city = Url.city();
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
       Meteor.subscribe('invitations'),
-      Meteor.subscribe('users') // XXX be more precise
+      Meteor.subscribe('usersInvitedByUser', Meteor.userId())
     ];
   }
 });
@@ -236,13 +228,12 @@ MapController = DefaultController.extend({
   template: 'map',
   waitOn: function () {
     var city = Url.city();
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('users') // XXX be more precise
-    ].concat(!city ? [] : [
+      Meteor.subscribe('usersOfCity', city),
       Meteor.subscribe('places', city),
       Meteor.subscribe('mapHackersLocations', {excludeCity: city}) // load anonym location data of all users world wide (XXX TODO: async)
-    ]);
+    ];
   },
   onAfterAction: function() {
     Interface.setHeaderStyle('fixed');
@@ -308,7 +299,7 @@ AdminController = DefaultAdminController.extend({
     return [];
   },
   onBeforeAction: function() {
-    this.redirect('admin_hackers');
+    this.redirect('admin_highlights');
   }
 });
 
@@ -322,12 +313,11 @@ AdminDashboardController = DefaultAdminController.extend({
 AdminDealsController = DefaultAdminController.extend({
   template: 'admin_deals',
   waitOn: function () {
-    var city = Session.get('currentCity');
     var isAdmin = Users.hasAdminPermission();
+    var city = Session.get('currentCity');
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('deals', isAdmin ? 'all' : city),
-      Meteor.subscribe('users') // XXX be more precise
+      Meteor.subscribe('deals', isAdmin ? 'all' : city)
     ];
   }
 });
@@ -336,9 +326,7 @@ AdminEmailTemplatesController = DefaultAdminController.extend({
   template: 'admin_emailTemplates',
   waitOn: function () {
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('emailTemplates'),
-      Meteor.subscribe('users') // XXX be more precise
+      Meteor.subscribe('emailTemplates')
     ];
   }
 });
@@ -350,11 +338,9 @@ AdminGrowthController = DefaultAdminController.extend({
   },
   waitOn: function () {
     return [
-      Meteor.subscribe('currentUser'),
       // load all github users from the selected city
       Meteor.subscribe('growthGithub', AdminGrowth.getCity()),
-      Meteor.subscribe('emailTemplates'),
-      Meteor.subscribe('users') // XXX be more precise
+      Meteor.subscribe('emailTemplates')
     ];
   }
 });
@@ -362,9 +348,11 @@ AdminGrowthController = DefaultAdminController.extend({
 AdminHackersController = DefaultAdminController.extend({
   template: 'admin_hackers',
   waitOn: function () {
+    var isAdmin = Users.hasAdminPermission();
+    var city = Session.get('currentCity');
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('users') // XXX be more precise
+      isAdmin ? Meteor.subscribe('usersAll') : Meteor.subscribe('usersOfCity', city)
     ];
   }
 });
@@ -372,12 +360,11 @@ AdminHackersController = DefaultAdminController.extend({
 AdminHighlightsController = DefaultAdminController.extend({
   template: 'admin_highlights',
   waitOn: function () {
-    var city = Session.get('currentCity');
     var isAdmin = Users.hasAdminPermission();
+    var city = Session.get('currentCity');
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('highlights', isAdmin ? 'all' : city),
-      Meteor.subscribe('users') // XXX be more precise
+      Meteor.subscribe('highlights', isAdmin ? 'all' : city)
     ];
   }
 });
@@ -386,12 +373,11 @@ AdminHighlightsController = DefaultAdminController.extend({
 AdminPlacesController = DefaultAdminController.extend({
   template: 'admin_places',
   waitOn: function () {
-    var city = Session.get('currentCity');
     var isAdmin = Users.hasAdminPermission();
+    var city = Session.get('currentCity');
+    if (!city) return [];
     return [
-      Meteor.subscribe('currentUser'),
-      Meteor.subscribe('places', isAdmin ? 'all' : city),
-      Meteor.subscribe('users') // XXX be more precise
+      Meteor.subscribe('places', isAdmin ? 'all' : city)
     ];
   }
 });
diff --git a/web/client/admin/admin.html b/client/admin/admin.html
similarity index 100%
rename from web/client/admin/admin.html
rename to client/admin/admin.html
diff --git a/web/client/admin/admin.js b/client/admin/admin.js
similarity index 93%
rename from web/client/admin/admin.js
rename to client/admin/admin.js
index d374a02..bcf50ef 100644
--- a/web/client/admin/admin.js
+++ b/client/admin/admin.js
@@ -42,12 +42,14 @@ Field.fn.avatar = function(val) {
 /* DATA FIELD templates */
 
 Field.edit = {
+  fieldId: 'id',
   key: 'id',
   label: 'edit',
   tmpl: Template.reactiveTable_editButton
 }
 
 Field.date = {
+  fieldId: 'createdAt',
   key: 'createdAt',
   label: 'date',
   sortByValue: true,
@@ -56,6 +58,7 @@ Field.date = {
 }
 
 Field.city = {
+  fieldId: 'city',
   key: 'city',
   label: 'city',
   fn: function(val, obj) {
@@ -65,6 +68,7 @@ Field.city = {
 }
 
 Field.private = {
+  fieldId: 'private',
   key: 'private',
   label: 'private',
   fn: function(val, obj) {
@@ -74,6 +78,7 @@ Field.private = {
 }
 
 Field.url = {
+  fieldId: 'url',
   key: 'url',
   label: 'url',
   fn: function(val, obj) {
diff --git a/web/client/admin/admin.styl b/client/admin/admin.styl
similarity index 100%
rename from web/client/admin/admin.styl
rename to client/admin/admin.styl
diff --git a/web/client/admin/dashboard/admin_dashboard.html b/client/admin/dashboard/admin_dashboard.html
similarity index 100%
rename from web/client/admin/dashboard/admin_dashboard.html
rename to client/admin/dashboard/admin_dashboard.html
diff --git a/web/client/admin/deals/admin_deals.html b/client/admin/deals/admin_deals.html
similarity index 100%
rename from web/client/admin/deals/admin_deals.html
rename to client/admin/deals/admin_deals.html
diff --git a/web/client/admin/deals/admin_deals.js b/client/admin/deals/admin_deals.js
similarity index 61%
rename from web/client/admin/deals/admin_deals.js
rename to client/admin/deals/admin_deals.js
index 71e3db0..92d9d6f 100644
--- a/web/client/admin/deals/admin_deals.js
+++ b/client/admin/deals/admin_deals.js
@@ -13,10 +13,10 @@ Template.admin_deals.helpers({
         Field.date,
         Field.city,
         Field.private,
-        'title',
-        'description',
+        { fieldId: 'title', key: 'title', label: 'title'},
+        { fieldId: 'description', key: 'description', label: 'description'},
         Field.url,
-        'code'
+        { fieldId: 'code', key: 'code', label: 'code'},
       ],
     }
   }
diff --git a/web/client/admin/emailTemplates/admin_emailTemplates.html b/client/admin/emailTemplates/admin_emailTemplates.html
similarity index 90%
rename from web/client/admin/emailTemplates/admin_emailTemplates.html
rename to client/admin/emailTemplates/admin_emailTemplates.html
index 89feeba..b191b47 100644
--- a/web/client/admin/emailTemplates/admin_emailTemplates.html
+++ b/client/admin/emailTemplates/admin_emailTemplates.html
@@ -1,22 +1,22 @@
 <template name="admin_emailTemplates">
   <div id="admin_emailTemplates" class="page">
-   
+
     {{> reactiveTable collection=collection settings=tableFormat}}
-    
+
     <div class="page-space"></div>
-    
+
     {{#autoForm collection="EmailTemplates" id="adminEmailTemplatesForm" doc=doc type=type}}
       {{#if equals type "insert"}}
         <h2>Add new Templates</h2>
       {{else}}
         <h2>
-          Update Template / 
+          Update Template /
           <button action="new-template" class="btn">New Template</button>
         </h2>
       {{/if}}
       <div class="row">
-        <div class="col-lg-4">  
-          {{> afQuickField name="groups" id="groups" options=groupOptions}}
+        <div class="col-lg-4">
+          {{> afQuickField name="groups" id="groups"}}
           {{#if equals type "insert"}}
             {{> afQuickField name="identifier" id="identifier"}}
           {{/if}}
@@ -43,7 +43,7 @@ <h2>
       </div>
       <div class="row">
         <div class="col-lg-6">
-          {{> afQuickField name="body" id="body" rows="6"}}          
+          {{> afQuickField name="body" id="body" rows="6"}}
           <em>Use ctrl+enter for normal line break.</em>
         </div>
         <div class="col-lg-6">
@@ -68,9 +68,9 @@ <h2>
             <table class="main" width="100%" cellpadding="0" cellspacing="0">
               <tr>
                 <td class="content-wrap">
-                  
+
                   {{content}}
-                  
+
                 </td>
               </tr>
             </table>
@@ -78,7 +78,7 @@ <h2>
               <table width="100%">
                 <tr>
                   <td class="aligncenter content-block">
-                    
+
                   </td>
                 </tr>
               </table>
diff --git a/web/client/admin/emailTemplates/admin_emailTemplates.js b/client/admin/emailTemplates/admin_emailTemplates.js
similarity index 96%
rename from web/client/admin/emailTemplates/admin_emailTemplates.js
rename to client/admin/emailTemplates/admin_emailTemplates.js
index e2b391e..201b7f1 100644
--- a/web/client/admin/emailTemplates/admin_emailTemplates.js
+++ b/client/admin/emailTemplates/admin_emailTemplates.js
@@ -12,9 +12,9 @@ Template.admin_emailTemplates.helpers({
       showFilter: false,
       rowsPerPage: 500,
       fields: [
-        'groups',
-        'subject',
-        'identifier',
+        { fieldId: 'groups', key: 'groups', label: 'groups'},
+        { fieldId: 'subject', key: 'subject', label: 'subject'},
+        { fieldId: 'identifier', key: 'identifier', label: 'identifier'},
         Field.edit,
       ],
     }
diff --git a/web/client/admin/emailTemplates/preview.styl b/client/admin/emailTemplates/preview.styl
similarity index 100%
rename from web/client/admin/emailTemplates/preview.styl
rename to client/admin/emailTemplates/preview.styl
diff --git a/web/client/admin/growth/admin_growth.html b/client/admin/growth/admin_growth.html
similarity index 100%
rename from web/client/admin/growth/admin_growth.html
rename to client/admin/growth/admin_growth.html
diff --git a/web/client/admin/growth/admin_growth.js b/client/admin/growth/admin_growth.js
similarity index 70%
rename from web/client/admin/growth/admin_growth.js
rename to client/admin/growth/admin_growth.js
index 843515d..de60768 100644
--- a/web/client/admin/growth/admin_growth.js
+++ b/client/admin/growth/admin_growth.js
@@ -22,25 +22,26 @@ var state = new State('adminGrowth', {
 var fields = function() {
   return [
     Field.city,
-    { key: 'createdAt', label: 'since', sortByValue: true, fn: Field.fn.date },
-    { key: 'avatarUrl', label: '#', fn: function(avatarUrl, obj) { return Safe.string('<a href="https://github.com/'+obj['username']+'" target="_blank"><img src="'+avatarUrl+'" width="50" /></a>'); }},
+    { fieldId: 'createdAt', key: 'createdAt', label: 'since', sortByValue: true, fn: Field.fn.date },
+    { fieldId: 'avatarUrl', key: 'avatarUrl', label: '#', fn: function(avatarUrl, obj) { return Safe.string('<a href="https://github.com/'+obj['username']+'" target="_blank"><img src="'+avatarUrl+'" width="50" /></a>'); }},
     // 'name',
-    'followers',
-    'following',
-    'repos',
-    'gists',
-    { key: 'username', label: 'username', sortByValue: true, fn: function(username) { return Safe.url("https://github.com/"+username, {text: username}); }},
-    { key: 'hireable', label: 'hire', fn: Field.fn.bool },
-    { key: 'biography', label: 'bio', fn: function(bio) { return bio ? Safe.string('<span class="glyphicon glyphicon-leaf" title="'+bio+'" style="cursor:help;"></span>') : ''; } },
-    { key: 'company', label: 'comp.', fn: function(company) { return company ? Safe.string('<span class="glyphicon glyphicon-briefcase" title="'+company+'" style="cursor:help;"></span>') : ''; } },
-    { key: 'location', label: 'loc.', fn: function(location) { return location ? Safe.string('<span class="glyphicon glyphicon-map-marker" title="'+location+'" style="cursor:help;"></span>') : ''; } },
-
-    { key: 'website', label: 'site', sortByValue: true, fn: function(url) { return url ? Safe.url(url, {text: '<span class="glyphicon glyphicon-globe"></span>'}) : ''; }},
-    { key: 'email', label: 'email', sortByValue: true, fn: Field.fn.email },
-    { key: 'invitedAt', label: 'invited', sortByValue: true, fn: Field.fn.date},
-    { key: 'open', label: 'open', sortByValue: true, fn: Field.fn.bool},
-    { key: 'clicks', label: 'clicks', sortByValue: true},
-    { key: 'signupAt', label: 'singup', sortByValue: true, fn: Field.fn.date},
+    { fieldId: 'followers', key: 'followers', label: 'followers'},
+    { fieldId: 'following', key: 'following', label: 'following'},
+    { fieldId: 'repos', key: 'repos', label: 'repos'},
+    { fieldId: 'gists', key: 'gists', label: 'gists'},
+
+    { fieldId: 'username', key: 'username', label: 'username', sortByValue: true, fn: function(username) { return Safe.url("https://github.com/"+username, {text: username}); }},
+    { fieldId: 'hireable', key: 'hireable', label: 'hire', fn: Field.fn.bool },
+    { fieldId: 'biography', key: 'biography', label: 'bio', fn: function(bio) { return bio ? Safe.string('<span class="glyphicon glyphicon-leaf" title="'+bio+'" style="cursor:help;"></span>') : ''; } },
+    { fieldId: 'company', key: 'company', label: 'comp.', fn: function(company) { return company ? Safe.string('<span class="glyphicon glyphicon-briefcase" title="'+company+'" style="cursor:help;"></span>') : ''; } },
+    { fieldId: 'location', key: 'location', label: 'loc.', fn: function(location) { return location ? Safe.string('<span class="glyphicon glyphicon-map-marker" title="'+location+'" style="cursor:help;"></span>') : ''; } },
+
+    { fieldId: 'website', key: 'website', label: 'site', sortByValue: true, fn: function(url) { return url ? Safe.url(url, {text: '<span class="glyphicon glyphicon-globe"></span>'}) : ''; }},
+    { fieldId: 'email', key: 'email', label: 'email', sortByValue: true, fn: Field.fn.email },
+    { fieldId: 'invitedAt', key: 'invitedAt', label: 'invited', sortByValue: true, fn: Field.fn.date},
+    { fieldId: 'open', key: 'open', label: 'open', sortByValue: true, fn: Field.fn.bool},
+    { fieldId: 'clicks', key: 'clicks', label: 'clicks', sortByValue: true},
+    { fieldId: 'signupAt', key: 'signupAt', label: 'singup', sortByValue: true, fn: Field.fn.date},
   ];
 };
 
diff --git a/web/client/admin/growth/admin_growth.styl b/client/admin/growth/admin_growth.styl
similarity index 100%
rename from web/client/admin/growth/admin_growth.styl
rename to client/admin/growth/admin_growth.styl
diff --git a/web/client/admin/hackers/admin_hackers.html b/client/admin/hackers/admin_hackers.html
similarity index 100%
rename from web/client/admin/hackers/admin_hackers.html
rename to client/admin/hackers/admin_hackers.html
diff --git a/web/client/admin/hackers/admin_hackers.js b/client/admin/hackers/admin_hackers.js
similarity index 51%
rename from web/client/admin/hackers/admin_hackers.js
rename to client/admin/hackers/admin_hackers.js
index b4fbff3..2657641 100644
--- a/web/client/admin/hackers/admin_hackers.js
+++ b/client/admin/hackers/admin_hackers.js
@@ -15,11 +15,11 @@ Template.admin_hackers.helpers({
       fields: [
         Field.date,
         Field.city,
-        { key: 'globalId', label: '#', sortByValue: true, fn: function(val, obj) { return Safe.url(Users.userProfileUrl(obj), {text: Users.userRank(obj) ? '#'+Users.userRank(obj) : '-'}); } },
-        { key: 'profile.name', label: 'name', sortByValue: true, fn: function(val, obj) { return Safe.url(Users.userProfileUrl(obj), {text: val || '-'}); } },
-        { key: 'profile.email', label: 'e-mail', sortByValue: true, fn: Field.fn.email },
-        { key: 'invitations', label: 'free invites' },
-        { key: '_id', label: 'status',
+        { fieldId: 'globalId', key: 'globalId', label: '#', sortByValue: true, fn: function(val, obj) { return Safe.url(Users.userProfileUrl(obj), {text: Users.userRank(obj) ? '#'+Users.userRank(obj) : '-'}); } },
+        { fieldId: 'profile.name', key: 'profile.name', label: 'name', sortByValue: true, fn: function(val, obj) { return Safe.url(Users.userProfileUrl(obj), {text: val || '-'}); } },
+        { fieldId: 'profile.email', key: 'profile.email', label: 'e-mail', sortByValue: true, fn: Field.fn.email },
+        { fieldId: 'invitations', key: 'invitations', label: 'free invites' },
+        { fieldId: '_id', key: '_id', label: 'status',
           fn: function(val, obj) {
             var labels = Users.userStatusLabel(obj);
             var makeLabel = function(label) { return '<span class="label label-'+label.style+'">'+label.text+'</span>'; }
diff --git a/web/client/admin/highlights/admin_highlights.html b/client/admin/highlights/admin_highlights.html
similarity index 100%
rename from web/client/admin/highlights/admin_highlights.html
rename to client/admin/highlights/admin_highlights.html
diff --git a/web/client/admin/highlights/admin_highlights.js b/client/admin/highlights/admin_highlights.js
similarity index 71%
rename from web/client/admin/highlights/admin_highlights.js
rename to client/admin/highlights/admin_highlights.js
index 1745149..4479a43 100644
--- a/web/client/admin/highlights/admin_highlights.js
+++ b/client/admin/highlights/admin_highlights.js
@@ -13,8 +13,8 @@ Template.admin_highlights.helpers({
         Field.date,
         Field.city,
         Field.private,
-        'title',
-        'subtitle',
+        {fieldId: 'title', key: 'title', label: 'title'},
+        {fieldId: 'subtitle', key: 'subtitle', label: 'subtitle'},
         Field.url,
       ],
     }
diff --git a/web/client/admin/places/admin_places.html b/client/admin/places/admin_places.html
similarity index 100%
rename from web/client/admin/places/admin_places.html
rename to client/admin/places/admin_places.html
diff --git a/web/client/admin/places/admin_places.js b/client/admin/places/admin_places.js
similarity index 62%
rename from web/client/admin/places/admin_places.js
rename to client/admin/places/admin_places.js
index aaef602..c7be0b9 100644
--- a/web/client/admin/places/admin_places.js
+++ b/client/admin/places/admin_places.js
@@ -13,9 +13,9 @@ Template.admin_places.helpers({
         Field.date,
         Field.city,
         Field.private,
-        'type',
-        'title',
-        'description',
+        {fieldId: 'type', key: 'type', label: 'type'},
+        {fieldId: 'title', key: 'title', label: 'title'},
+        {fieldId: 'description', key: 'description', label: 'description'},
         Field.url,
       ],
     }
diff --git a/web/client/emails/data.js b/client/emails/data.js
similarity index 100%
rename from web/client/emails/data.js
rename to client/emails/data.js
diff --git a/web/client/emails/localMeetup.html b/client/emails/localMeetup.html
similarity index 100%
rename from web/client/emails/localMeetup.html
rename to client/emails/localMeetup.html
diff --git a/web/client/emails/localMeetupReminder.html b/client/emails/localMeetupReminder.html
similarity index 100%
rename from web/client/emails/localMeetupReminder.html
rename to client/emails/localMeetupReminder.html
diff --git a/web/client/emails/localMessage.html b/client/emails/localMessage.html
similarity index 100%
rename from web/client/emails/localMessage.html
rename to client/emails/localMessage.html
diff --git a/web/client/emails/personalInviteSlots.html b/client/emails/personalInviteSlots.html
similarity index 100%
rename from web/client/emails/personalInviteSlots.html
rename to client/emails/personalInviteSlots.html
diff --git a/web/client/emails/personalMessage.html b/client/emails/personalMessage.html
similarity index 100%
rename from web/client/emails/personalMessage.html
rename to client/emails/personalMessage.html
diff --git a/web/client/emails/personalMissingInfo.html b/client/emails/personalMissingInfo.html
similarity index 100%
rename from web/client/emails/personalMissingInfo.html
rename to client/emails/personalMissingInfo.html
diff --git a/web/client/emails/personalWelcome.html b/client/emails/personalWelcome.html
similarity index 100%
rename from web/client/emails/personalWelcome.html
rename to client/emails/personalWelcome.html
diff --git a/web/client/emails/personalWelcome10first.html b/client/emails/personalWelcome10first.html
similarity index 100%
rename from web/client/emails/personalWelcome10first.html
rename to client/emails/personalWelcome10first.html
diff --git a/web/client/lib/_startup.js b/client/lib/_startup.js
similarity index 100%
rename from web/client/lib/_startup.js
rename to client/lib/_startup.js
diff --git a/web/client/lib/editor.js b/client/lib/editor.js
similarity index 100%
rename from web/client/lib/editor.js
rename to client/lib/editor.js
diff --git a/web/client/lib/interface.js b/client/lib/interface.js
similarity index 100%
rename from web/client/lib/interface.js
rename to client/lib/interface.js
diff --git a/web/client/lib/loginService.js b/client/lib/loginService.js
similarity index 100%
rename from web/client/lib/loginService.js
rename to client/lib/loginService.js
diff --git a/web/client/lib/router.js b/client/lib/router.js
similarity index 100%
rename from web/client/lib/router.js
rename to client/lib/router.js
diff --git a/web/client/lib/safeString.js b/client/lib/safeString.js
similarity index 100%
rename from web/client/lib/safeString.js
rename to client/lib/safeString.js
diff --git a/web/client/lib/state.js b/client/lib/state.js
similarity index 100%
rename from web/client/lib/state.js
rename to client/lib/state.js
diff --git a/web/client/main.html b/client/main.html
similarity index 100%
rename from web/client/main.html
rename to client/main.html
diff --git a/web/client/main.js b/client/main.js
similarity index 100%
rename from web/client/main.js
rename to client/main.js
diff --git a/web/client/main.styl b/client/main.styl
similarity index 94%
rename from web/client/main.styl
rename to client/main.styl
index 99411e7..9a71c45 100644
--- a/web/client/main.styl
+++ b/client/main.styl
@@ -12,6 +12,7 @@ html, body {
   margin: 0;
   padding: 0;
   height: 100%;
+  font-size: 14px;
 }
 body{
   font-family: 'Tiempos Text', 'open sans';
@@ -31,7 +32,13 @@ a img {
   border:0px;
 }
 
-
+/* bootstrap adjustments */
+.control-label{
+  padding-top: 6px !important;
+}
+.btn{
+  padding: 6px 12px 4px 12px !important;
+}
 
 #iron-router-progress {
   background-color: #fff;
@@ -97,7 +104,6 @@ a img {
 
   .alert h1 {
     font-size: 26px;
-    margin-top: 5px;
     margin-bottom: 5px;
   }
   .alert p {
@@ -107,10 +113,22 @@ a img {
   .main-alerts,
   .alert-wrapper {
     width: 100%;
-    background-color: rgba(255,255,255,0.3);
+    background-color: rgba(255,255,255,0.15);
+    /*animation: fadeIn 2s;    
+    @keyframes fadeIn {
+      from {
+        background-color: rgba(255, 249, 208, 1)
+      }
+      to {
+        background-color: rgba(255,255,255,0.15)
+      }
+    }*/
     .alert {
       margin: 10px 0px;
       width: 550px;
+      h1{
+        margin-top: -20px;
+      }
     }
   }
 
@@ -358,6 +376,8 @@ a img {
     margin-top: -5px;
     transition: none;
     height:30px;
+    outline:0px !important;
+    -webkit-appearance:none;
   }
   input.text:hover {
     border: 1px solid rgba(0,0,0,0);
@@ -471,7 +491,7 @@ a img {
       text-overflow: "";  /*Removes default arrow from firefox*/
       padding-left: 12px;
       font-size: 18px;
-      line-height: 18px;
+      line-height: 35px;
       height: 33px;
 
       optgroup{
@@ -510,6 +530,6 @@ a img {
 }
 /* Replacement for button-inverse of bootstrap 2 */
 a.btn.btn-inverse, button.btn.btn-inverse {
-    background-color:#444;
-    color:#fff;
+    background-color: rgba(255,255,255,0.15);
+    color:#fff9d0;
 }
diff --git a/web/client/pages/agenda/agenda.html b/client/pages/agenda/agenda.html
similarity index 100%
rename from web/client/pages/agenda/agenda.html
rename to client/pages/agenda/agenda.html
diff --git a/web/client/pages/agenda/agenda.js b/client/pages/agenda/agenda.js
similarity index 100%
rename from web/client/pages/agenda/agenda.js
rename to client/pages/agenda/agenda.js
diff --git a/web/client/pages/books/books.html b/client/pages/books/books.html
similarity index 100%
rename from web/client/pages/books/books.html
rename to client/pages/books/books.html
diff --git a/web/client/pages/books/books.js b/client/pages/books/books.js
similarity index 100%
rename from web/client/pages/books/books.js
rename to client/pages/books/books.js
diff --git a/web/client/pages/books/books.styl b/client/pages/books/books.styl
similarity index 100%
rename from web/client/pages/books/books.styl
rename to client/pages/books/books.styl
diff --git a/web/client/pages/deals/deals.html b/client/pages/deals/deals.html
similarity index 100%
rename from web/client/pages/deals/deals.html
rename to client/pages/deals/deals.html
diff --git a/web/client/pages/deals/deals.js b/client/pages/deals/deals.js
similarity index 100%
rename from web/client/pages/deals/deals.js
rename to client/pages/deals/deals.js
diff --git a/web/client/pages/deals/deals.styl b/client/pages/deals/deals.styl
similarity index 100%
rename from web/client/pages/deals/deals.styl
rename to client/pages/deals/deals.styl
diff --git a/web/client/pages/frontpage/frontpage.html b/client/pages/frontpage/frontpage.html
similarity index 100%
rename from web/client/pages/frontpage/frontpage.html
rename to client/pages/frontpage/frontpage.html
diff --git a/web/client/pages/frontpage/frontpage.js b/client/pages/frontpage/frontpage.js
similarity index 100%
rename from web/client/pages/frontpage/frontpage.js
rename to client/pages/frontpage/frontpage.js
diff --git a/web/client/pages/frontpage/frontpage.styl b/client/pages/frontpage/frontpage.styl
similarity index 99%
rename from web/client/pages/frontpage/frontpage.styl
rename to client/pages/frontpage/frontpage.styl
index b9520f2..396ba6c 100644
--- a/web/client/pages/frontpage/frontpage.styl
+++ b/client/pages/frontpage/frontpage.styl
@@ -225,6 +225,7 @@ exit-button()
         border-width: 3px;
         border-radius: 0px !important;
         margin-top: 50px;
+        padding-top: 9px;
       }
       #enroll-btn-large:hover{
           background-color:rgba(0,0,0,0.1);
diff --git a/web/client/pages/hacker/hacker.html b/client/pages/hacker/hacker.html
similarity index 91%
rename from web/client/pages/hacker/hacker.html
rename to client/pages/hacker/hacker.html
index 3da1bd6..140142f 100644
--- a/web/client/pages/hacker/hacker.html
+++ b/client/pages/hacker/hacker.html
@@ -10,38 +10,38 @@
 
           {{#if invitationLimitReached}}
             <div class="alert alert-error">
-              <p>This personal invitation URL has reached its maximum. When the person who gave you this URL will get new slots you will se it here. You can also apply trough the application process on the homepage.</p>
+              <p>The personal invitation URL you are trying to use has reached its maximum. When the person who gave you this URL will get new slots you will se it here. You can also apply trough the application process on the homepage.</p>
             </div>
           {{/if}}
 
           {{#if isUnverifiedEmail}}
             <div class="access-denied alert alert-info">
-              <h1>Check your e-mail :)</h1>
-              <p>We have sent you an email with a validation link</p>
+              <h1>Check your inbox !</h1>
+              <p>We just send you an email with a validation link.</p>
             </div>
           {{else}}
             {{#if tellUsMore}}
               {{#if isInvited}}
                 {{! XXX user must only complete his profile to enter website (already invited) }}
                 <div class="access-denied alert alert-info">
-                  <h1>Tell us more</h1>
-                  <p>Before you start using the website we need you to give us <strong>some more information</strong>, so that other hackers can get a feel for who you are :)</p>
+                  <h1>psssst !</h1>
+                  <p>Please provide <strong>some more information</strong>,<br />so that other users can relate to you :)</p>
                 </div>
               {{else}}
                 {{! XXX user must complete his profile AND needs to be invited by someone }}
                 <div class="access-denied alert alert-info">
                   <h1>Tell us more</h1>
-                  <p>To enter the wailting list please complete your profile. Every now an then we handpick some of you to become members.</p>
-                  <p>To ensure acces you can also ask a member you know, to vouch for you, by providing you his invitation url. (before or after completing your profile)</p>
+                  <p>To enter the wailting list please complete your profile, there is a good chance we will activate your account in matter of days.</p>
+                  <p>To have instant acces you can also ask a member you know to vouch for you, by providing you his invitation url. (this works before and after completing your profile)</p>
                 </div>
               {{/if}}
             {{else}}
               {{#unless isInvited}}
                 {{! XXX profile is completely filled in but user needs to be invited by someone }}
                 <div class="access-denied alert alert-success">
-                  <h1>Thank you</h1>
-                  <p>Right now there are no open slots in the community. Every now an then we handpick some of the people like you who entered the waiting list. If this is the case we will notify you.</p>
-                  <p>To ensure acces you can also ask a member you know, to vouch for you, by providing you his invitation url.</p>
+                  <h1>Profile complte</h1>
+                  <p>Right now there are no open slots in the community. There is a good chance we will activate your account in matter of days. If this is the case we will notify you by email.</p>
+                  <p>For instant acces you can also ask a member you know to vouch for you, by providing you his invitation url.</p>
                 </div>
               {{/unless}}
             {{/if}}
@@ -83,8 +83,8 @@ <h1>Thank you</h1>
           <div class="form-group">
             <label class="control-label col-sm-2"></label>
             <div class="controls col-sm-8 profile-ready">
-              Are you ready to enter the website?
-              <button class="button-ready btn btn-large btn-success">yes, I'm ready</button>
+              Is your profile complete?<br /><br />
+              <button class="button-ready btn btn-large btn-success">I'm ready</button>
             </div>
           </div>
         </form>
@@ -151,7 +151,7 @@ <h1>Thank you</h1>
 
       </div>
       <div class="controls col-sm-8" style="padding-top:76px;">
-        <input type="text" name="profile.name" class="text save {{required 'profile.name'}}" autosave value="{{profile.name}}" placeholder="full name" id="inputName" style="height:50px;font-size:36px;font-weight:700;border-radius: 24px;padding: 6px 21px; width:350px; line-height:36px; margin-left:-15px;" required />
+        <input type="text" name="profile.name" class="text save {{required 'profile.name'}}" autosave value="{{profile.name}}" placeholder="full name" id="inputName" style="height:50px;font-size:36px;font-weight:700;border-radius: 24px; padding: 7px 0px 0px 18px !important; width:350px; line-height:36px; margin-left:-18px;" required />
       </div>
     </div>
 
@@ -160,7 +160,7 @@ <h1>Thank you</h1>
       <label class="control-label col-sm-2" for="inputCity">city</label>
       <div class="controls col-sm-8">
         {{> citySelect}}
-        <span class="description hover">— Choose your local city</span>
+        <span class="description hover" style="margin-left:12px;">your primary city</span>
       </div>
     </div>
     {{/unless}}
@@ -173,7 +173,7 @@ <h1>Thank you</h1>
           <span class="description hover">— email will be not visible by other users</span><br/>
         {{/if}}
         {{#if isDuplicateEmail}}
-          <span class="help-inline">Already used in another account!</span>
+          <span class="help-inline"><br />this email adress is used by another account!<br />You can merge your accounts by using the social connect underneath.</span>
         {{/if}}
         {{#if isNotValidEmail}}
           <span class="help-inline">invalid email!</span>
@@ -269,7 +269,7 @@ <h1>Thank you</h1>
 
         <label for="inputAvailableCall" class="checkbox">
           <input type="checkbox" name="profile.available" class="save" autosave-set id="inputAvailableCall" value="call" {{checked "profile.available" "call"}} />
-          call <span class="description hover">— hackers in {{CurrentCity.name}} can see your Skype handle and/or phone number</span>
+          call <span class="description hover">— hackers in {{CurrentCity.name}} can see your Skype handle and phone number</span>
         </label>
         <div class="clear details {{#unless checked 'profile.available' 'call'}}hide{{/unless}}">
           <input type="text" name="profile.skype" class="text save" autosave value="{{profile.skype}}" placeholder="skype" id="inputSkype" /><br>
@@ -289,7 +289,7 @@ <h1>Thank you</h1>
 
         <label for="inputAvailableCouchsurf" class="checkbox">
           <input type="checkbox" name="profile.available" class="save" autosave-set id="inputAvailableCouchsurf" value="couchsurf" {{checked "profile.available" "couchsurf"}} />
-          couchsurfing <span class="description hover">— hackers traveling to {{CurrentCity.name}} can see your email address and/or phone number to get in touch to stay at your place</span>
+          couchsurfing <span class="description hover">— hackers traveling to {{CurrentCity.name}} can see your email address and phone number to get in touch to stay at your place</span>
           <div class="details"></div>
         </label>
       </div>
@@ -309,7 +309,7 @@ <h1>Thank you</h1>
           <a href="{{profile.social.facebook}}" target="_blank">{{ShowUrl profile.social.facebook}}</a>
           <a href="#" class="toggle toggleService" data-service="facebook"><span class="glyphicon glyphicon-remove icon-white"></span></a>
         {{else}}
-          <span class="disabled">none</span>
+          <span class="disabled">no account</span>
           <a href="#" class="toggle toggleService" data-service="facebook"><i class="glyphicon glyphicon-plus glyphicon-white"></i> add</a>
         {{/if}}
         {{#if serviceError 'facebook'}}
@@ -325,7 +325,7 @@ <h1>Thank you</h1>
           <a href="{{profile.social.twitter}}" target="_blank">{{ShowUrl profile.social.twitter}}</a>
           <a href="#" class="toggle toggleService" data-service="twitter"><span class="glyphicon glyphicon-remove glyphicon-white"></span></a>
         {{else}}
-          <span class="disabled">none</span>
+          <span class="disabled">no account</span>
           <a href="#" class="toggle toggleService" data-service="twitter"><i class="glyphicon glyphicon-plus glyphicon-white"></i> add</a>
         {{/if}}
         {{#if serviceError 'twitter'}}
@@ -341,7 +341,7 @@ <h1>Thank you</h1>
           <a href="{{profile.social.github}}" target="_blank">{{ShowUrl profile.social.github}}</a>
           <a href="#" class="toggle toggleService" data-service="github"><span class="glyphicon glyphicon-remove glyphicon-white"></span></a>
         {{else}}
-          <span class="disabled">none</span>
+          <span class="disabled">no account</span>
           <a href="#" class="toggle toggleService" data-service="github"><i class="glyphicon glyphicon-plus glyphicon-white"></i> add</a>
         {{/if}}
         {{#if serviceError 'github'}}
diff --git a/web/client/pages/hacker/hacker.js b/client/pages/hacker/hacker.js
similarity index 100%
rename from web/client/pages/hacker/hacker.js
rename to client/pages/hacker/hacker.js
diff --git a/web/client/pages/hacker/hacker.styl b/client/pages/hacker/hacker.styl
similarity index 96%
rename from web/client/pages/hacker/hacker.styl
rename to client/pages/hacker/hacker.styl
index bdc680f..94df43a 100644
--- a/web/client/pages/hacker/hacker.styl
+++ b/client/pages/hacker/hacker.styl
@@ -41,6 +41,11 @@
     }
   }
 
+  .help-inline{
+    color: orange;
+    font-weight: normal;
+  }
+
   #mapWrapper.edit {
     position: relative;
     width: 200px;
@@ -185,6 +190,7 @@
   .edit-social {
     .disabled {
       opacity: 0.6;
+      margin-right: 10px;
     }
     .icon {
       position: relative;
@@ -253,12 +259,10 @@
   }
 
   .profile-ready {
-    margin-top: 25px;
-    font-size: 22px;
+    margin-top: 40px;
+    font-size: 18px;
     .button-ready {
-      margin-left: 10px;
       position: relative;
-      top: -3px;
     }
   }
 
@@ -288,9 +292,17 @@
         margin-top: 6px;
       }
     }
+
     label > .details{
       display: block;
     }
+
+    .details{
+      padding-top: 6px;
+      input{
+        margin-left: 9px;
+      }
+    }
   }
 
   .skillset-input {
@@ -329,7 +341,6 @@
 
     .hacking-container{
       float:left;
-      font-size: 18px;
       clear:left;
       margin-bottom: 12px;
       margin-top: 20px;
@@ -337,12 +348,10 @@
 
     .hacking-tag{
       float:left;
-      line-height: 32px;
       background-color: rgba(0,0,0,0.45);
-      border-radius: 18px;
-      padding: 0px 13px 2px 14px;
+      border-radius: 3px;
+      padding: 1px 11px 0px 10px;
       margin-right: 6px;
-      font-weight: 700;
     }
 
     .hacker-number{
diff --git a/web/client/pages/hacker/hackerToolbar.html b/client/pages/hacker/hackerToolbar.html
similarity index 98%
rename from web/client/pages/hacker/hackerToolbar.html
rename to client/pages/hacker/hackerToolbar.html
index 363a324..2c1937f 100644
--- a/web/client/pages/hacker/hackerToolbar.html
+++ b/client/pages/hacker/hackerToolbar.html
@@ -2,7 +2,7 @@
   <div id="hackerToolbar" class="toolbar-section">
 
     {{#if hasAmbassadorPermission}}
-    
+
       {{#if active "mail"}}
         {{> hackerToolbarPanelMail}}
       {{/if}}
@@ -36,7 +36,7 @@
 
       <div class="toolbar">
         <div class="pull-right">
-          
+
           {{#if statusLabels}}
             {{#each statusLabels}}
               <span class="text label label-{{style}}">{{text}}</span>
@@ -51,7 +51,7 @@
             <button action="sendVerificationEmail" class="btn btn-inverse  btn-small light" data-toggle="tooltip" title="Resend verification email to this user"><span class="glyphicon-white glyphicon-envelope" ></span> Verify</button>
             <button action="verifyEmail" class="btn btn-inverse btn-small light" data-toggle="tooltip" title="Skip verification of user's email address [NOT RECOMMENDED]"><span class="glyphicon-white glyphicon-envelope"></span> Force</button>
           {{/if}}
-          
+
           <input class="input-sm" type="number" id="invitationsNumber" value="{{HackerProp 'invitations'}}" style="width:35px;" data-toggle="tooltip" title="#number of free invite slots" />
 
 
@@ -70,7 +70,7 @@
         </div>
         <div class="clear"></div>
       </div>
-    
+
     {{/if}}
 
   </div>
@@ -83,7 +83,7 @@
       <label for="template">Template</label>
       {{> afFieldInput name="group" id="template"}}
       {{> afQuickField name="subject" id="subject" style="width:540px"}}
-      {{> afQuickField name="message" id="message" style="width:540px" rows="10"}}
+      {{> afQuickField name="message" id="message" style="width:540px" rows=10}}
       <button action="submit" class="btn btn-primary">Send</button>
     {{/autoForm}}
   </div>
diff --git a/web/client/pages/hacker/hackerToolbar.js b/client/pages/hacker/hackerToolbar.js
similarity index 99%
rename from web/client/pages/hacker/hackerToolbar.js
rename to client/pages/hacker/hackerToolbar.js
index bbe2660..4e7be08 100644
--- a/web/client/pages/hacker/hackerToolbar.js
+++ b/client/pages/hacker/hackerToolbar.js
@@ -135,7 +135,7 @@ Template.hackerToolbarPanelMail.events({
     var formData = $form.serializeObject();
 
     // validate email
-    if (!AutoForm.validateForm("hackerMailForm"))
+    if (! AutoForm.getValidationContext("hackerMailForm").validate(formData))
       return;
 
     // disable button for a few seconds
diff --git a/web/client/pages/hacker/map.js b/client/pages/hacker/map.js
similarity index 100%
rename from web/client/pages/hacker/map.js
rename to client/pages/hacker/map.js
diff --git a/web/client/pages/hacker/skills.html b/client/pages/hacker/skills.html
similarity index 100%
rename from web/client/pages/hacker/skills.html
rename to client/pages/hacker/skills.html
diff --git a/web/client/pages/hacker/skills.js b/client/pages/hacker/skills.js
similarity index 100%
rename from web/client/pages/hacker/skills.js
rename to client/pages/hacker/skills.js
diff --git a/web/client/pages/hacker/skills.styl b/client/pages/hacker/skills.styl
similarity index 100%
rename from web/client/pages/hacker/skills.styl
rename to client/pages/hacker/skills.styl
diff --git a/web/client/pages/hackers/hackers.html b/client/pages/hackers/hackers.html
similarity index 93%
rename from web/client/pages/hackers/hackers.html
rename to client/pages/hackers/hackers.html
index d0717f3..cfe9a0a 100644
--- a/web/client/pages/hackers/hackers.html
+++ b/client/pages/hackers/hackers.html
@@ -9,11 +9,11 @@
       {{#if hacking}}{{{hacking}}}{{/if}} {{Plural "hacker" total}} in {{CurrentCity.name}} <br/>
       {{#if skills}}that {{Plural "does" "do" total}} {{{skills}}}{{/if}}
     </div>
-    
+
     {{#each hackerViews}}
-      {{> hackersEntry}}    
+      {{> hackersEntry}}
     {{/each}}
-   
+
     <div class="clear"></div>
 
     {{> invitations_partial}}
@@ -36,17 +36,17 @@
 <template name="hackersFilter">
   <div id="hackersFilter">
     <form id="hackersFilterForm">
-      
+
       <select name="filter" class="chosen-select" multiple data-placeholder="&nbsp;search hackers &mdash; ex. Growth hackers that do Ruby on Rails" >
         <optgroup label="Hacking">
           {{#each Constant "HACKING_OPTIONS"}}
             <option value="hacking-{{value}}" {{selectedHacking}}>{{label}}</option>
-          {{/each}}    
+          {{/each}}
         </optgroup>
         <optgroup label="Skills">
           {{#each Constant "SKILLS"}}
             <option value="skill-{{name}}" {{selectedSkill}}>{{name}}</option>
-          {{/each}}  
+          {{/each}}
         </optgroup>
       </select>
 
@@ -57,7 +57,7 @@
 <template name="hackersToolbar">
   <div id="hackersToolbar" class="toolbar-section">
   {{#if hasAmbassadorPermission}}
-    
+
     {{#if active}}
       <div class="panel">
         <div id="hackersNewsletterEditor">
@@ -66,7 +66,7 @@
             <label for="template">Template</label>
             {{> afFieldInput name="group" id="template"}}
             {{> afQuickField name="subject" id="subject" style="width:540px"}}
-            {{> afQuickField name="message" id="message" rows="10" style="width:540px"}}
+            {{> afQuickField name="message" id="message" rows=10 style="width:540px"}}
             <button action="submit" class="btn btn-primary">Send</button>
             <button action="submit" preview="true" class="btn btn-inverse">Send me a preview</button>
           {{/autoForm}}
@@ -80,7 +80,7 @@
       </div>
       <div class="clear"></div>
     </div>
-    
+
   {{/if}}
   </div>
 </template>
diff --git a/web/client/pages/hackers/hackers.js b/client/pages/hackers/hackers.js
similarity index 98%
rename from web/client/pages/hackers/hackers.js
rename to client/pages/hackers/hackers.js
index c9cda26..d44f648 100644
--- a/web/client/pages/hackers/hackers.js
+++ b/client/pages/hackers/hackers.js
@@ -119,7 +119,7 @@ Template.hackersToolbar.events({
     var formData = $form.serializeObject();
     var isPreview = $button.attr('preview') === "true";
 
-    if (!AutoForm.validateForm("hackersNewsletterEditorForm"))
+    if (! AutoForm.getValidationContext("hackersNewsletterEditorForm").validate(formData))
       return;
 
     // disable button for a few seconds
diff --git a/web/client/pages/hackers/hackers.styl b/client/pages/hackers/hackers.styl
similarity index 100%
rename from web/client/pages/hackers/hackers.styl
rename to client/pages/hackers/hackers.styl
diff --git a/web/client/pages/highlights/highlights.html b/client/pages/highlights/highlights.html
similarity index 100%
rename from web/client/pages/highlights/highlights.html
rename to client/pages/highlights/highlights.html
diff --git a/web/client/pages/highlights/highlights.js b/client/pages/highlights/highlights.js
similarity index 100%
rename from web/client/pages/highlights/highlights.js
rename to client/pages/highlights/highlights.js
diff --git a/web/client/pages/highlights/highlights.styl b/client/pages/highlights/highlights.styl
similarity index 100%
rename from web/client/pages/highlights/highlights.styl
rename to client/pages/highlights/highlights.styl
diff --git a/web/client/pages/invitations/invitations.html b/client/pages/invitations/invitations.html
similarity index 100%
rename from web/client/pages/invitations/invitations.html
rename to client/pages/invitations/invitations.html
diff --git a/web/client/pages/invitations/invitations.js b/client/pages/invitations/invitations.js
similarity index 100%
rename from web/client/pages/invitations/invitations.js
rename to client/pages/invitations/invitations.js
diff --git a/web/client/pages/invitations/invitations.styl b/client/pages/invitations/invitations.styl
similarity index 100%
rename from web/client/pages/invitations/invitations.styl
rename to client/pages/invitations/invitations.styl
diff --git a/web/client/pages/map/map.html b/client/pages/map/map.html
similarity index 100%
rename from web/client/pages/map/map.html
rename to client/pages/map/map.html
diff --git a/web/client/pages/map/map.js b/client/pages/map/map.js
similarity index 100%
rename from web/client/pages/map/map.js
rename to client/pages/map/map.js
diff --git a/web/client/pages/map/map.styl b/client/pages/map/map.styl
similarity index 100%
rename from web/client/pages/map/map.styl
rename to client/pages/map/map.styl
diff --git a/web/client/partials/editor/editor.html b/client/partials/editor/editor.html
similarity index 100%
rename from web/client/partials/editor/editor.html
rename to client/partials/editor/editor.html
diff --git a/web/client/partials/editor/editor.js b/client/partials/editor/editor.js
similarity index 100%
rename from web/client/partials/editor/editor.js
rename to client/partials/editor/editor.js
diff --git a/web/client/partials/editor/editor.styl b/client/partials/editor/editor.styl
similarity index 100%
rename from web/client/partials/editor/editor.styl
rename to client/partials/editor/editor.styl
diff --git a/web/client/partials/hacker/availableButtons.html b/client/partials/hacker/availableButtons.html
similarity index 100%
rename from web/client/partials/hacker/availableButtons.html
rename to client/partials/hacker/availableButtons.html
diff --git a/web/client/partials/loading/loading.html b/client/partials/loading/loading.html
similarity index 100%
rename from web/client/partials/loading/loading.html
rename to client/partials/loading/loading.html
diff --git a/web/client/partials/loading/spin.styl b/client/partials/loading/spin.styl
similarity index 100%
rename from web/client/partials/loading/spin.styl
rename to client/partials/loading/spin.styl
diff --git a/web/client/partials/toolbar/toolbar.styl b/client/partials/toolbar/toolbar.styl
similarity index 100%
rename from web/client/partials/toolbar/toolbar.styl
rename to client/partials/toolbar/toolbar.styl
diff --git a/web/client/style.import.styl b/client/style.import.styl
similarity index 100%
rename from web/client/style.import.styl
rename to client/style.import.styl
diff --git a/web/client/style.styl b/client/style.styl
similarity index 100%
rename from web/client/style.styl
rename to client/style.styl
diff --git a/web/packages/account/account/account.jsdoc b/packages/account/account/account.jsdoc
similarity index 93%
rename from web/packages/account/account/account.jsdoc
rename to packages/account/account/account.jsdoc
index 7772d0f..c1eb405 100644
--- a/web/packages/account/account/account.jsdoc
+++ b/packages/account/account/account.jsdoc
@@ -6,21 +6,21 @@ Account = {};
  * @summary Attach or move user to some city. Users can move thereself to another city when they are not fully registered. Otherwise only ambassadors have the permissions to move users.
  * @locus Server
  * @param {String} hackerId The *userId* of the user that will be attached to the given city.
- * @param {String} city The *cityKey* of the city where user will be attached to. 
+ * @param {String} city The *cityKey* of the city where user will be attached to.
  */
 Account.moveUserToCity = function(hackerId, city) { // called from Methods.js
   var hacker = Users.findOne(hackerId);
-  
+
   if (!hacker)
-    throw new Meteor.Error(500, "no such user");  
+    throw new Meteor.Error(500, "no such user");
 
   if (!_.contains(City.identifiers(), city))
-    throw new Meteor.Error(500, "no valid city");  
+    throw new Meteor.Error(500, "no valid city");
 
   // check permissions
   var userId = this.userId || Meteor.userId();
   var me = userId === hackerId;
-  
+
   var allowed = function() {
     if (me && hacker.isAccessDenied)
       return true;
@@ -33,10 +33,10 @@ Account.moveUserToCity = function(hackerId, city) { // called from Methods.js
       throw new Meteor.Error(500, 'not allowed');
 
     if (!hacker.isAccessDenied && me) {
-      if (ambPerm) 
-        throw new Meteor.Error(500, "can't move yourself");  
-      else 
-        throw new Meteor.Error(500, "cite move not allowed", 'already registered at some city');  
+      if (ambPerm)
+        throw new Meteor.Error(500, "can't move yourself");
+      else
+        throw new Meteor.Error(500, "cite move not allowed", 'already registered at some city');
     }
 
     return true;
@@ -80,7 +80,7 @@ Account.verifyInvitation = function(phrase) {
  * @param {Number} phrase The *invitationPhrase* of the user who sent the invitation.
  * @param {String} userId The userId of the user who request access to the site.
  */
-Account.verifyInvitationOfUser = function(phrase, userId) { 
+Account.verifyInvitationOfUser = function(phrase, userId) {
   check(phrase, Number);
   check(userId, String);
 
@@ -109,14 +109,14 @@ Account.verifyInvitationOfUser = function(phrase, userId) {
 
   if (broadcastUser.invitations < 1)
     throw new Meteor.Error(200, "limit", "Invitation limit reached.");
-  
+
   // invitation valid
 
   // insert invitation couple in database
   Invitations.insert({
     broadcastUser: broadcastUser._id,
     receivingUser: userId
-  });  
+  });
 
   // decrement broadcast user's unused invitations
   Meteor.users.update(broadcastUser._id, {$inc: {invitations: -1}});
@@ -141,7 +141,7 @@ Account.forceInvitationOfUser = function(userId) {
   Meteor.users.update(userId, {$unset: {isUninvited: true}});
 
   // check if user now get access to the website
-  Account.requestAccessOfUser(userId); 
+  Account.requestAccessOfUser(userId);
 }
 
 
@@ -151,14 +151,14 @@ Account.forceInvitationOfUser = function(userId) {
  * @locus Server
  * @param {String} userId The userId of the user who will get access to the site.
  */
-Account.requestAccessOfUser = function(userId) { 
+Account.requestAccessOfUser = function(userId) {
   var user = Meteor.users.findOne(userId);
 
   if (!user)
     throw new Meteor.Error(500, "Unknow user");
 
-  if (!user.city) 
-    throw new Meteor.Error(500, "User isn't attached to some city.");    
+  if (!user.city)
+    throw new Meteor.Error(500, "User isn't attached to some city.");
 
   if (user.isUninvited)
     throw new Meteor.Error(500, "notInvited", "User hasn't used an invitation code.");
@@ -173,7 +173,7 @@ Account.requestAccessOfUser = function(userId) {
 
   // execute these commands if user had previously no access
   if (user.isAccessDenied === true) {
-    
+
     // set signup date
     if (!user.accessAt)
       Meteor.users.update(userId, {$set: {accessAt: new Date()}});
@@ -190,7 +190,7 @@ Account.requestAccessOfUser = function(userId) {
 
 
 /**
- * @summary User let us know that he is ready filling in his profile. 
+ * @summary User let us know that he is ready filling in his profile.
  * Check if all required properties are filled in.
  * @locus Server
  */
@@ -238,7 +238,7 @@ Account.forceEmailVerification = function(userId) {
   if (!_.contains(emails, user.profile.email))
     throw new Meteor.Error(500, "E-mail not registered", "E-mail address not present in user's list of addresses.")
   if (_.findWhere(user.emails, {address: user.profile.email, verified: true}))
-    throw new Meteor.Error(500, "E-mail already verified")    
+    throw new Meteor.Error(500, "E-mail already verified")
 
   // force verification
   Users.update({_id: userId, "emails.address": user.profile.email}, {$set: {"emails.$.verified": true}});
@@ -271,7 +271,7 @@ Account.sendVerificationEmail = function(userId) {
 
 
 // make a user visible for others
-// by default a user is hidden at time of signup 
+// by default a user is hidden at time of signup
 // until he is allowed to access the site.
 // also admins are hidden
 var requestVisibility = function() {
@@ -281,7 +281,7 @@ var requestVisibility = function() {
   requestVisibilityOfUser(Meteor.userId());
 }
 
-// when this function is called, is must already be verified that 
+// when this function is called, is must already be verified that
 // the user is allowed to do this operation
 var requestVisibilityOfUser = function(userId) {
   var user = Meteor.users.findOne(userId);
@@ -296,13 +296,3 @@ var requestVisibilityOfUser = function(userId) {
   // make user visible to other users
   Meteor.users.update(userId, {$unset: {isHidden: true}});
 }
-
-
-
-
-
-
-
-
-
-
diff --git a/web/packages/account/account/hooks.jsdoc b/packages/account/account/hooks.jsdoc
similarity index 91%
rename from web/packages/account/account/hooks.jsdoc
rename to packages/account/account/hooks.jsdoc
index cf0f0ab..17d1cbe 100644
--- a/web/packages/account/account/hooks.jsdoc
+++ b/packages/account/account/hooks.jsdoc
@@ -23,17 +23,17 @@ Accounts.onCreateUser(function (options, user) {
     user.emails = [];
 
   // find an existing user that probaly match this identity
-  var existingUser = Account.userData.findExistingUser(user);  
+  var existingUser = Account.userData.findExistingUser(user);
 
 
-  if (existingUser) { 
+  if (existingUser) {
 
     // merge data from existing user if exists
     user = Account.userData.mergeUserData(existingUser, user);
     Meteor.users.remove(existingUser._id);
 
-  } else { 
-    // additional information, for new user only!  
+  } else {
+    // additional information, for new user only!
 
     // don't allow access until user completes his profile
     user.isUninvited = true;
@@ -55,19 +55,19 @@ Accounts.onCreateUser(function (options, user) {
     user.mailings = _.chain(MAILING_OPTIONS).where({checked: true}).pluck('value').value();
 
     // new users on development have direct access and become admin
-    if (_.contains(["dev","local"], Settings['environment'])) {
+    if (_.contains(["local"], Settings['environment'])) {
       user.isAdmin = true;
       user.isUninvited = false;
       user.staff = {
-        title: "staff", 
+        title: "staff",
         email: "mail@hckrs.io",
       };
     }
 
   }
-  
+
   // create new user account
-  return user; 
+  return user;
 });
 
 
@@ -87,8 +87,8 @@ Accounts.validateLoginAttempt(function(info) {
     var userIp = info.connection.clientAddress;
     var location = Geo.requestLocationForIp(userIp);
     currentCity = Geo.findClosestCity(location);
-  } 
-  
+  }
+
   if (!currentCity) { // we can't verify if user is logged in at correct city
     return;
   } else if (!userCity) { // this new user isn't attached to a city yet, attach now!
@@ -96,6 +96,6 @@ Accounts.validateLoginAttempt(function(info) {
   } else if (userCity !== currentCity && !info.user.isAdmin) { // check if existing user is logging in at his own city (or is admin)
     throw new Meteor.Error(1, "city unmatch", userCity);
   }
-    
+
   return true;
 });
diff --git a/web/packages/account/account/methods.jsdoc b/packages/account/account/methods.jsdoc
similarity index 100%
rename from web/packages/account/account/methods.jsdoc
rename to packages/account/account/methods.jsdoc
diff --git a/web/packages/account/account/register-services.jsdoc b/packages/account/account/register-services.jsdoc
similarity index 100%
rename from web/packages/account/account/register-services.jsdoc
rename to packages/account/account/register-services.jsdoc
diff --git a/web/packages/account/account/servicedata.jsdoc b/packages/account/account/servicedata.jsdoc
similarity index 95%
rename from web/packages/account/account/servicedata.jsdoc
rename to packages/account/account/servicedata.jsdoc
index f8fe9af..a7d9636 100644
--- a/web/packages/account/account/servicedata.jsdoc
+++ b/packages/account/account/servicedata.jsdoc
@@ -26,7 +26,7 @@ Account.serviceData.fetchUserData = function(user, service) {
 
     "facebook": function(user) {
       var url = "https://graph.facebook.com/me";
-      var fields = ['id', 'email', 'name', 'locale', 'picture', 'link', 'username', 'location', 'birthday', 'gender', 'website', 'work'];
+      var fields = ['id', 'email', 'name', 'locale', 'picture', 'link', 'location', 'birthday', 'gender', 'website', 'work'];
       return OAuth.userCall(user, 'facebook', 'GET', url, {fields: fields}).data;
     },
 
@@ -100,8 +100,8 @@ Account.serviceData.unify = function(data, service) {
         data.birthday = new Date(p[2], p[0], p[1]);
       }
 
-      if (data.username && data.picture && data.picture.data && !data.picture.data.is_silhouette)
-        data.picture = "https://graph.facebook.com/" + data.username + "/picture?type=large";
+      if (data.id)
+        data.picture = "http://graph.facebook.com/" + data.id + "/picture?type=large";
 
       if (data.location && data.location.name)
         data.location = Geo.geocode(data.location.name);
diff --git a/web/packages/account/account/userdata.jsdoc b/packages/account/account/userdata.jsdoc
similarity index 100%
rename from web/packages/account/account/userdata.jsdoc
rename to packages/account/account/userdata.jsdoc
diff --git a/web/packages/account/package.js b/packages/account/package.js
similarity index 100%
rename from web/packages/account/package.js
rename to packages/account/package.js
diff --git a/web/packages/account/versions.json b/packages/account/versions.json
similarity index 100%
rename from web/packages/account/versions.json
rename to packages/account/versions.json
diff --git a/web/packages/base/package.js b/packages/base/package.js
similarity index 100%
rename from web/packages/base/package.js
rename to packages/base/package.js
diff --git a/web/packages/base/versions.json b/packages/base/versions.json
similarity index 100%
rename from web/packages/base/versions.json
rename to packages/base/versions.json
diff --git a/web/packages/cities/cities/cities.js b/packages/cities/cities/cities.js
similarity index 100%
rename from web/packages/cities/cities/cities.js
rename to packages/cities/cities/cities.js
diff --git a/web/packages/cities/cities/country-codes.js b/packages/cities/cities/country-codes.js
similarity index 100%
rename from web/packages/cities/cities/country-codes.js
rename to packages/cities/cities/country-codes.js
diff --git a/web/packages/cities/cities/export.jsdoc b/packages/cities/cities/export.jsdoc
similarity index 100%
rename from web/packages/cities/cities/export.jsdoc
rename to packages/cities/cities/export.jsdoc
diff --git a/web/packages/cities/package.js b/packages/cities/package.js
similarity index 100%
rename from web/packages/cities/package.js
rename to packages/cities/package.js
diff --git a/web/packages/cities/versions.json b/packages/cities/versions.json
similarity index 100%
rename from web/packages/cities/versions.json
rename to packages/cities/versions.json
diff --git a/web/packages/collection-base/collection-base/auto-value.jsdoc b/packages/collection-base/collection-base/auto-value.jsdoc
similarity index 100%
rename from web/packages/collection-base/collection-base/auto-value.jsdoc
rename to packages/collection-base/collection-base/auto-value.jsdoc
diff --git a/web/packages/collection-base/collection-base/collection.jsdoc b/packages/collection-base/collection-base/collection.jsdoc
similarity index 100%
rename from web/packages/collection-base/collection-base/collection.jsdoc
rename to packages/collection-base/collection-base/collection.jsdoc
diff --git a/web/packages/collection-base/collection-base/permissions.jsdoc b/packages/collection-base/collection-base/permissions.jsdoc
similarity index 100%
rename from web/packages/collection-base/collection-base/permissions.jsdoc
rename to packages/collection-base/collection-base/permissions.jsdoc
diff --git a/web/packages/collection-base/collection-base/schemas.jsdoc b/packages/collection-base/collection-base/schemas.jsdoc
similarity index 100%
rename from web/packages/collection-base/collection-base/schemas.jsdoc
rename to packages/collection-base/collection-base/schemas.jsdoc
diff --git a/web/packages/collection-base/package.js b/packages/collection-base/package.js
similarity index 100%
rename from web/packages/collection-base/package.js
rename to packages/collection-base/package.js
diff --git a/web/packages/collection-base/versions.json b/packages/collection-base/versions.json
similarity index 100%
rename from web/packages/collection-base/versions.json
rename to packages/collection-base/versions.json
diff --git a/web/packages/collection-deals/deals/allow-deny.js b/packages/collection-deals/deals/allow-deny.js
similarity index 100%
rename from web/packages/collection-deals/deals/allow-deny.js
rename to packages/collection-deals/deals/allow-deny.js
diff --git a/web/packages/collection-deals/deals/collection.jsdoc b/packages/collection-deals/deals/collection.jsdoc
similarity index 100%
rename from web/packages/collection-deals/deals/collection.jsdoc
rename to packages/collection-deals/deals/collection.jsdoc
diff --git a/web/packages/collection-deals/deals/methods.js b/packages/collection-deals/deals/methods.js
similarity index 100%
rename from web/packages/collection-deals/deals/methods.js
rename to packages/collection-deals/deals/methods.js
diff --git a/web/packages/collection-deals/deals/publish.js b/packages/collection-deals/deals/publish.js
similarity index 59%
rename from web/packages/collection-deals/deals/publish.js
rename to packages/collection-deals/deals/publish.js
index 3da21ef..2bbc75c 100644
--- a/web/packages/collection-deals/deals/publish.js
+++ b/packages/collection-deals/deals/publish.js
@@ -1,10 +1,11 @@
+var options = {fields: Query.fieldsArray(UserFields.permissionDeps)};
 
 // Only publish deals for the city the user is visiting
 Meteor.publish("deals", function (city) {
-  var user = Users.findOne(this.userId);
+  var user = Users.findOne(this.userId, options);
 
-  if(!user || !Users.allowedAccess(user._id))
-    return [];  
+  if(!user || !Users.allowedAccess(user))
+    return [];
 
   if (city === 'all' && Users.isAdmin(user))
     return Deals.find({});
@@ -17,13 +18,13 @@ Meteor.publish("deals", function (city) {
 
 // Only publish sortings for the city the user is visiting
 Meteor.publish("dealsSort", function (city) {
-  var user = Users.findOne(this.userId);
-  
-  if(!user || !Users.allowedAccess(user._id))
-    return [];  
+  var user = Users.findOne(this.userId, options);
+
+  if(!user || !Users.allowedAccess(user))
+    return [];
 
   if (user.city === city || Users.isAdmin(user))
-    return DealsSort.find({city: city}); 
+    return DealsSort.find({city: city});
 
   return [];
-});
\ No newline at end of file
+});
diff --git a/web/packages/collection-deals/deals/schema.js b/packages/collection-deals/deals/schema.js
similarity index 100%
rename from web/packages/collection-deals/deals/schema.js
rename to packages/collection-deals/deals/schema.js
diff --git a/web/packages/collection-deals/package.js b/packages/collection-deals/package.js
similarity index 100%
rename from web/packages/collection-deals/package.js
rename to packages/collection-deals/package.js
diff --git a/web/packages/collection-deals/versions.json b/packages/collection-deals/versions.json
similarity index 100%
rename from web/packages/collection-deals/versions.json
rename to packages/collection-deals/versions.json
diff --git a/web/packages/collection-email-templates/email-templates/allow-deny.js b/packages/collection-email-templates/email-templates/allow-deny.js
similarity index 100%
rename from web/packages/collection-email-templates/email-templates/allow-deny.js
rename to packages/collection-email-templates/email-templates/allow-deny.js
diff --git a/web/packages/collection-email-templates/email-templates/collection.jsdoc b/packages/collection-email-templates/email-templates/collection.jsdoc
similarity index 100%
rename from web/packages/collection-email-templates/email-templates/collection.jsdoc
rename to packages/collection-email-templates/email-templates/collection.jsdoc
diff --git a/web/packages/collection-email-templates/email-templates/constants.js b/packages/collection-email-templates/email-templates/constants.js
similarity index 87%
rename from web/packages/collection-email-templates/email-templates/constants.js
rename to packages/collection-email-templates/email-templates/constants.js
index ef25ac9..24ae416 100644
--- a/web/packages/collection-email-templates/email-templates/constants.js
+++ b/packages/collection-email-templates/email-templates/constants.js
@@ -1,15 +1,15 @@
 /* Template Groups */
 
-// These Array of usage options describes for groups of 
+// These Array of usage options describes for groups of
 // email templates which variables may be used.
 EMAIL_TEMPLATE_GROUPS_OPTIONS = [
-  
+
   // "growthGithub" is located within the admin panel
   // and allows us to mail a group of github users.
   // The variables corresponds to the user data from Github.
-  { 
-    value: "growthGithub", 
-    label: "Growth Github", 
+  {
+    value: "growthGithub",
+    label: "Growth Github",
     vars: [ /* automatic extracted from example */ ],
     example: {
       'SIGNUP_URL': 'http://utrecht.hckrs.io/gh/FDMwdYYXxMY7dLcD4',
@@ -41,5 +41,5 @@ _.each(EMAIL_TEMPLATE_GROUPS_OPTIONS, function(group) {
   group.vars = _.keys(group.example);
 });
 
-// List containing names of all different template groups 
+// List containing names of all different template groups
 EMAIL_TEMPLATE_GROUPS_VALUES = _.pluck(EMAIL_TEMPLATE_GROUPS_OPTIONS, 'value');
diff --git a/web/packages/collection-email-templates/email-templates/publish.js b/packages/collection-email-templates/email-templates/publish.js
similarity index 100%
rename from web/packages/collection-email-templates/email-templates/publish.js
rename to packages/collection-email-templates/email-templates/publish.js
diff --git a/web/packages/collection-email-templates/email-templates/schema.js b/packages/collection-email-templates/email-templates/schema.js
similarity index 50%
rename from web/packages/collection-email-templates/email-templates/schema.js
rename to packages/collection-email-templates/email-templates/schema.js
index 9ce3caa..a0c3abe 100644
--- a/web/packages/collection-email-templates/email-templates/schema.js
+++ b/packages/collection-email-templates/email-templates/schema.js
@@ -6,29 +6,32 @@ Schemas.EmailTemplates = new SimpleSchema([
   Schemas.default,
   {
     "identifier": { // short name for reference
-      type: String, 
+      type: String,
       label: 'Template Name',
-      unique: true, 
+      unique: true,
       autoValue: function() { // value not allowed to update onces setted.
         if (this.isInsert) return this.value;
         if (this.isUpsert) return {$setOnInsert: this.value};
-        this.unset(); 
-      } 
+        this.unset();
+      }
     },
-    "subject": { 
-      type: String, 
-      optional: true, 
-      label: 'Subject' 
+    "subject": {
+      type: String,
+      optional: true,
+      label: 'Subject'
     },
-    "body": { 
-      type: String, 
-      optional: true, 
-      label: 'Body' 
+    "body": {
+      type: String,
+      optional: true,
+      label: 'Body'
     },
     "groups": { /* which groups this template belongs to */
-      type: [String], 
-      optional: true, 
-      allowedValues: EMAIL_TEMPLATE_GROUPS_VALUES 
+      type: [String],
+      optional: true,
+      allowedValues: EMAIL_TEMPLATE_GROUPS_VALUES,
+      autoform: {
+        options: _.map(EMAIL_TEMPLATE_GROUPS_OPTIONS, function(option) { return _.pick(option, 'value', 'label'); })
+      }
     },
   }
 ]);
diff --git a/web/packages/collection-email-templates/package.js b/packages/collection-email-templates/package.js
similarity index 100%
rename from web/packages/collection-email-templates/package.js
rename to packages/collection-email-templates/package.js
diff --git a/web/packages/collection-email-templates/versions.json b/packages/collection-email-templates/versions.json
similarity index 100%
rename from web/packages/collection-email-templates/versions.json
rename to packages/collection-email-templates/versions.json
diff --git a/web/packages/collection-emails-outbound/emails-outbound/allow-deny.js b/packages/collection-emails-outbound/emails-outbound/allow-deny.js
similarity index 100%
rename from web/packages/collection-emails-outbound/emails-outbound/allow-deny.js
rename to packages/collection-emails-outbound/emails-outbound/allow-deny.js
diff --git a/web/packages/collection-emails-outbound/emails-outbound/collection.jsdoc b/packages/collection-emails-outbound/emails-outbound/collection.jsdoc
similarity index 100%
rename from web/packages/collection-emails-outbound/emails-outbound/collection.jsdoc
rename to packages/collection-emails-outbound/emails-outbound/collection.jsdoc
diff --git a/web/packages/collection-emails-outbound/emails-outbound/publish.js b/packages/collection-emails-outbound/emails-outbound/publish.js
similarity index 100%
rename from web/packages/collection-emails-outbound/emails-outbound/publish.js
rename to packages/collection-emails-outbound/emails-outbound/publish.js
diff --git a/web/packages/collection-emails-outbound/emails-outbound/schema.js b/packages/collection-emails-outbound/emails-outbound/schema.js
similarity index 100%
rename from web/packages/collection-emails-outbound/emails-outbound/schema.js
rename to packages/collection-emails-outbound/emails-outbound/schema.js
diff --git a/web/packages/collection-emails-outbound/package.js b/packages/collection-emails-outbound/package.js
similarity index 100%
rename from web/packages/collection-emails-outbound/package.js
rename to packages/collection-emails-outbound/package.js
diff --git a/web/packages/collection-emails-outbound/versions.json b/packages/collection-emails-outbound/versions.json
similarity index 100%
rename from web/packages/collection-emails-outbound/versions.json
rename to packages/collection-emails-outbound/versions.json
diff --git a/web/packages/collection-growth/growthGithub/allow-deny.js b/packages/collection-growth/growthGithub/allow-deny.js
similarity index 100%
rename from web/packages/collection-growth/growthGithub/allow-deny.js
rename to packages/collection-growth/growthGithub/allow-deny.js
diff --git a/web/packages/collection-growth/growthGithub/collection.jsdoc b/packages/collection-growth/growthGithub/collection.jsdoc
similarity index 100%
rename from web/packages/collection-growth/growthGithub/collection.jsdoc
rename to packages/collection-growth/growthGithub/collection.jsdoc
diff --git a/web/packages/collection-growth/growthGithub/publish.js b/packages/collection-growth/growthGithub/publish.js
similarity index 100%
rename from web/packages/collection-growth/growthGithub/publish.js
rename to packages/collection-growth/growthGithub/publish.js
diff --git a/web/packages/collection-growth/growthGithub/schema.js b/packages/collection-growth/growthGithub/schema.js
similarity index 100%
rename from web/packages/collection-growth/growthGithub/schema.js
rename to packages/collection-growth/growthGithub/schema.js
diff --git a/web/packages/collection-growth/package.js b/packages/collection-growth/package.js
similarity index 100%
rename from web/packages/collection-growth/package.js
rename to packages/collection-growth/package.js
diff --git a/web/packages/collection-growth/versions.json b/packages/collection-growth/versions.json
similarity index 100%
rename from web/packages/collection-growth/versions.json
rename to packages/collection-growth/versions.json
diff --git a/web/packages/collection-highlights/highlights/allow-deny.js b/packages/collection-highlights/highlights/allow-deny.js
similarity index 100%
rename from web/packages/collection-highlights/highlights/allow-deny.js
rename to packages/collection-highlights/highlights/allow-deny.js
diff --git a/web/packages/collection-highlights/highlights/collection.jsdoc b/packages/collection-highlights/highlights/collection.jsdoc
similarity index 100%
rename from web/packages/collection-highlights/highlights/collection.jsdoc
rename to packages/collection-highlights/highlights/collection.jsdoc
diff --git a/web/packages/collection-highlights/highlights/methods.js b/packages/collection-highlights/highlights/methods.js
similarity index 100%
rename from web/packages/collection-highlights/highlights/methods.js
rename to packages/collection-highlights/highlights/methods.js
diff --git a/web/packages/collection-highlights/highlights/publish.js b/packages/collection-highlights/highlights/publish.js
similarity index 55%
rename from web/packages/collection-highlights/highlights/publish.js
rename to packages/collection-highlights/highlights/publish.js
index 7f4b79f..4e7107e 100644
--- a/web/packages/collection-highlights/highlights/publish.js
+++ b/packages/collection-highlights/highlights/publish.js
@@ -1,29 +1,30 @@
+var options = {fields: Query.fieldsArray(UserFields.permissionDeps)};
 
 // Only publish highlights for the city the user is visiting
 Meteor.publish("highlights", function (city) {
-  var user = Users.findOne(this.userId);
+  var user = Users.findOne(this.userId, options);
 
-  if(!user || !Users.allowedAccess(user._id))
-    return [];  
+  if(!user || !Users.allowedAccess(user))
+    return [];
 
   if (city === 'all' && Users.isAdmin(user))
-    return Highlights.find({});      
+    return Highlights.find({});
 
   if (user.city === city || Users.isAdmin(user))
-    return Highlights.find({$or: [{private: false}, {city: city}]});      
+    return Highlights.find({$or: [{private: false}, {city: city}]});
 
   return [];
 });
 
 // Only publish sortings for the city the user is visiting
 Meteor.publish("highlightsSort", function (city) {
-  var user = Users.findOne(this.userId);
+  var user = Users.findOne(this.userId, options);
 
-  if(!user || !Users.allowedAccess(user._id))
-    return [];  
+  if(!user || !Users.allowedAccess(user))
+    return [];
 
   if (user.city === city || Users.isAdmin(user))
-    return HighlightsSort.find({city: city}); 
+    return HighlightsSort.find({city: city});
 
   return [];
-});
\ No newline at end of file
+});
diff --git a/web/packages/collection-highlights/highlights/schema.js b/packages/collection-highlights/highlights/schema.js
similarity index 100%
rename from web/packages/collection-highlights/highlights/schema.js
rename to packages/collection-highlights/highlights/schema.js
diff --git a/web/packages/collection-highlights/package.js b/packages/collection-highlights/package.js
similarity index 98%
rename from web/packages/collection-highlights/package.js
rename to packages/collection-highlights/package.js
index b66f8bf..e482e00 100644
--- a/web/packages/collection-highlights/package.js
+++ b/packages/collection-highlights/package.js
@@ -6,16 +6,16 @@ Package.describe({
 
 Package.onUse(function(api) {
   api.use('hckrs:docs');
-  
+
   api.use('base');
   api.use('collection-users');
-  
+
   api.addFiles('highlights/collection.jsdoc');
   api.addFiles('highlights/schema.js');
   api.addFiles('highlights/allow-deny.js');
   api.addFiles('highlights/publish.js', 'server');
   api.addFiles('highlights/methods.js', 'server');
-  
+
   api.export([
     'Highlights',
     'HighlightsSort',
diff --git a/web/packages/collection-highlights/versions.json b/packages/collection-highlights/versions.json
similarity index 100%
rename from web/packages/collection-highlights/versions.json
rename to packages/collection-highlights/versions.json
diff --git a/web/packages/collection-invitations/invitations/allow-deny.js b/packages/collection-invitations/invitations/allow-deny.js
similarity index 100%
rename from web/packages/collection-invitations/invitations/allow-deny.js
rename to packages/collection-invitations/invitations/allow-deny.js
diff --git a/web/packages/collection-invitations/invitations/collection.jsdoc b/packages/collection-invitations/invitations/collection.jsdoc
similarity index 100%
rename from web/packages/collection-invitations/invitations/collection.jsdoc
rename to packages/collection-invitations/invitations/collection.jsdoc
diff --git a/web/packages/collection-invitations/invitations/publish.js b/packages/collection-invitations/invitations/publish.js
similarity index 100%
rename from web/packages/collection-invitations/invitations/publish.js
rename to packages/collection-invitations/invitations/publish.js
diff --git a/web/packages/collection-invitations/invitations/schema.js b/packages/collection-invitations/invitations/schema.js
similarity index 100%
rename from web/packages/collection-invitations/invitations/schema.js
rename to packages/collection-invitations/invitations/schema.js
diff --git a/web/packages/collection-invitations/package.js b/packages/collection-invitations/package.js
similarity index 100%
rename from web/packages/collection-invitations/package.js
rename to packages/collection-invitations/package.js
diff --git a/web/packages/collection-invitations/versions.json b/packages/collection-invitations/versions.json
similarity index 100%
rename from web/packages/collection-invitations/versions.json
rename to packages/collection-invitations/versions.json
diff --git a/web/packages/collection-migrations/migrations/allow-deny.js b/packages/collection-migrations/migrations/allow-deny.js
similarity index 100%
rename from web/packages/collection-migrations/migrations/allow-deny.js
rename to packages/collection-migrations/migrations/allow-deny.js
diff --git a/web/packages/collection-migrations/migrations/collection.jsdoc b/packages/collection-migrations/migrations/collection.jsdoc
similarity index 100%
rename from web/packages/collection-migrations/migrations/collection.jsdoc
rename to packages/collection-migrations/migrations/collection.jsdoc
diff --git a/web/packages/collection-migrations/migrations/schema.js b/packages/collection-migrations/migrations/schema.js
similarity index 100%
rename from web/packages/collection-migrations/migrations/schema.js
rename to packages/collection-migrations/migrations/schema.js
diff --git a/web/packages/collection-migrations/package.js b/packages/collection-migrations/package.js
similarity index 100%
rename from web/packages/collection-migrations/package.js
rename to packages/collection-migrations/package.js
diff --git a/web/packages/collection-migrations/versions.json b/packages/collection-migrations/versions.json
similarity index 100%
rename from web/packages/collection-migrations/versions.json
rename to packages/collection-migrations/versions.json
diff --git a/web/packages/collection-places/package.js b/packages/collection-places/package.js
similarity index 100%
rename from web/packages/collection-places/package.js
rename to packages/collection-places/package.js
diff --git a/web/packages/collection-places/places/allow-deny.js b/packages/collection-places/places/allow-deny.js
similarity index 100%
rename from web/packages/collection-places/places/allow-deny.js
rename to packages/collection-places/places/allow-deny.js
diff --git a/web/packages/collection-places/places/collection.jsdoc b/packages/collection-places/places/collection.jsdoc
similarity index 100%
rename from web/packages/collection-places/places/collection.jsdoc
rename to packages/collection-places/places/collection.jsdoc
diff --git a/web/packages/collection-places/places/constants.js b/packages/collection-places/places/constants.js
similarity index 100%
rename from web/packages/collection-places/places/constants.js
rename to packages/collection-places/places/constants.js
diff --git a/web/packages/collection-places/places/methods.js b/packages/collection-places/places/methods.js
similarity index 100%
rename from web/packages/collection-places/places/methods.js
rename to packages/collection-places/places/methods.js
diff --git a/web/packages/collection-places/places/publish.js b/packages/collection-places/places/publish.js
similarity index 50%
rename from web/packages/collection-places/places/publish.js
rename to packages/collection-places/places/publish.js
index 5e31564..cf88c94 100644
--- a/web/packages/collection-places/places/publish.js
+++ b/packages/collection-places/places/publish.js
@@ -1,15 +1,16 @@
+var options = {fields: Query.fieldsArray(UserFields.permissionDeps)};
 
 Meteor.publish("places", function (city) {
-  var user = Users.findOne(this.userId);
+  var user = Users.findOne(this.userId, options);
 
-  if(!user || !Users.allowedAccess(user._id))
-    return [];  
+  if(!user || !Users.allowedAccess(user))
+    return [];
 
   if (city === 'all' && Users.isAdmin(user))
-    return Places.find({});      
-    
+    return Places.find({});
+
   if (user.city === city || Users.isAdmin(user))
-    return Places.find({$or: [{private: false}, {city: city}]});      
+    return Places.find({$or: [{private: false}, {city: city}]});
 
   return [];
-});
\ No newline at end of file
+});
diff --git a/web/packages/collection-places/places/schema.js b/packages/collection-places/places/schema.js
similarity index 100%
rename from web/packages/collection-places/places/schema.js
rename to packages/collection-places/places/schema.js
diff --git a/web/packages/collection-places/versions.json b/packages/collection-places/versions.json
similarity index 100%
rename from web/packages/collection-places/versions.json
rename to packages/collection-places/versions.json
diff --git a/web/packages/collection-users/package.js b/packages/collection-users/package.js
similarity index 93%
rename from web/packages/collection-users/package.js
rename to packages/collection-users/package.js
index 4c443c5..4387da0 100644
--- a/web/packages/collection-users/package.js
+++ b/packages/collection-users/package.js
@@ -6,7 +6,7 @@ Package.describe({
 
 Package.onUse(function(api) {
   api.use('hckrs:docs');
-  
+
   api.use('base');
   api.use('collection-base');
   api.use('cities');
@@ -24,9 +24,9 @@ Package.onUse(function(api) {
   api.addFiles('users/hooks.js', 'server');
   api.addFiles('users/tmpl-helpers.js', 'client');
 
-  api.imply('collection-base');  
+  api.imply('collection-base');
   api.export([
-    'Users',
+    'Users', 'UserFields',
     'HACKING_OPTIONS', 'HACKING_VALUES', 'HACKING',
     'AVAILABLE_OPTIONS', 'AVAILABLE_VALUES', 'AVAILABLE',
     'MAILING_OPTIONS', 'MAILING_VALUES',
diff --git a/web/packages/collection-users/users/allow-deny.js b/packages/collection-users/users/allow-deny.js
similarity index 100%
rename from web/packages/collection-users/users/allow-deny.js
rename to packages/collection-users/users/allow-deny.js
diff --git a/web/packages/collection-users/users/collection.jsdoc b/packages/collection-users/users/collection.jsdoc
similarity index 100%
rename from web/packages/collection-users/users/collection.jsdoc
rename to packages/collection-users/users/collection.jsdoc
diff --git a/web/packages/collection-users/users/constants.js b/packages/collection-users/users/constants.js
similarity index 100%
rename from web/packages/collection-users/users/constants.js
rename to packages/collection-users/users/constants.js
diff --git a/web/packages/collection-users/users/helpers.jsdoc b/packages/collection-users/users/helpers.jsdoc
similarity index 95%
rename from web/packages/collection-users/users/helpers.jsdoc
rename to packages/collection-users/users/helpers.jsdoc
index b58ccf5..e204771 100644
--- a/web/packages/collection-users/users/helpers.jsdoc
+++ b/packages/collection-users/users/helpers.jsdoc
@@ -4,32 +4,32 @@
 
 
 /**
- * @summary Get property from the specified user, without reactive 
+ * @summary Get property from the specified user, without reactive
  * dependencies on the other user properties.
  * @locus Anywhere
  * @param {String|Object} user userId or user object
  * @param {String} field Name of the property that you want to obtain
  * @param {Object} [opts] Options passed to `cursor.findOne(..., options)`
- * @example 
+ * @example
  * ```
  * Users.prop('srX87t29FW7CCYbjd', 'city');  // 'utrecht'
  * ```
  */
 Users.prop = function(user, field, options) {
-  
+
   // memorized
   var prop = _.isObject(user) ? Object.property(user, field) : undefined;
   if (!_.isUndefined(prop))
     return prop;
-  
+
   var userId = _.isObject(user) ? user._id : user;
   var opt = {fields: _.object([field], [true])};
   user = Meteor.users.findOne(userId, _.extend(options || {}, opt));
-  return Object.property(user, field); 
+  return Object.property(user, field);
 }
 
 /**
- * @summary Get multiple properties from the specified user, without reactive 
+ * @summary Get multiple properties from the specified user, without reactive
  * dependencies on the other properties.
  * @locus Anywhere
  * @param {String|Object} user userId or user object
@@ -52,16 +52,16 @@ Users.props = function(user, fields, options) {
 
   var userId = _.isObject(user) ? user._id : user;
   var opt = {fields: _.object(fields, _.map(fields, function() { return true; }))};
-  return Meteor.users.findOne(userId, _.extend(options || {}, opt));  
+  return Meteor.users.findOne(userId, _.extend(options || {}, opt));
 }
 
 /**
- * @summary Get property from current logged in user, without reactive 
+ * @summary Get property from current logged in user, without reactive
  * dependencies on the other properties.
  * @locus Anywhere
  * @param {String} field Name of the property that you want to obtain
  * @param {Object} [opts] Options passed to `cursor.findOne(..., options)`
- * @example 
+ * @example
  * ```
  * Users.myProp('city');  // 'utrecht'
  * ```
@@ -71,14 +71,14 @@ Users.myProp = function(field, options) {
 }
 
 /**
- * @summary Get multiple properties from current logged in user, without reactive 
+ * @summary Get multiple properties from current logged in user, without reactive
  * dependencies on the other properties.
  * @locus Anywhere
  * @param {String[]} fields Names of the properties that you want to obtain
  * @param {Object} [opts] Options passed to `cursor.find(..., options)`
  * @example
  * ```
- * Users.myProps(['city', 'isAdmin']); 
+ * Users.myProps(['city', 'isAdmin']);
  * //=> {_id: "srX87t29FW7CCYbjd", city: 'utrecht', isAdmin: true}
  * ```
  */
@@ -92,15 +92,15 @@ Users.myProps = function(fields, options) {
 /* permission helpers */
 
 /**
- * @summary Check if the given user is an admin.  
- * 
+ * @summary Check if the given user is an admin.
+ *
  * * If no user is spcified, the logged in user will be used instead.
- * 
+ *
  * @locus Anywhere
  * @param {String|Object} [user] Some userId or user object.
  * @example
  * ```
- * Users.isAdmin("srX87t29FW7CCYbjd"); 
+ * Users.isAdmin("srX87t29FW7CCYbjd");
  * //=> true
  * ```
  */
@@ -120,7 +120,7 @@ Users.isAdmin = function(user) {
  * @param {String} [city] City identifier.
  * @example
  * ```
- * Users.isAmbassador("srX87t29FW7CCYbjd", "utrecht"); 
+ * Users.isAmbassador("srX87t29FW7CCYbjd", "utrecht");
  * //=> false
  * ```
  */
@@ -145,7 +145,7 @@ Users.isAmbassador = function(user, city) {
  * @example
  * ```
  * var doc = {city: "utrecht", userId: "srX87t29FW7CCYbjd"};
- * Users.isOwner("srX87t29FW7CCYbjd", doc); 
+ * Users.isOwner("srX87t29FW7CCYbjd", doc);
  * //=> true
  * ```
  */
@@ -215,7 +215,7 @@ Users.hasOwnerPermission = function(user, doc) {
  * @summary If Users.isAdminPermission() return false this function will trhow an error.
  *
  * * If no user is spcified, the logged in user will be used instead.
- * 
+ *
  * @locus Anywhere
  * @param {String|Object} [user] Some userId or user object.
  */
@@ -229,7 +229,7 @@ Users.checkAdminPermission = function(user) {
  *
  * * If no user is specified, the logged in user will be used instead.
  * * If no city is specified, the current city (of logged in user) will be used instead.
- * 
+ *
  * @locus Anywhere
  * @param {String|Object} [user] Some userId or user object.
  * @param {String} [city] City identifier.
@@ -243,17 +243,16 @@ Users.checkAmbassadorPermission = function(user, city) {
  * @summary Check if the user has access to the site, by checking the **isAccessDenied** property.
  *
  * The **isAccessDenied** property can be false if:
- * 
+ *
  * * The user isn't invited.
  * * The user has an incomplete profile.
  * * The user hasn't validate his email address.
  * * The user is blocked.
- * 
+ *
  * @locus Anywhere
- * @param {String} [user] Some userId.
+ * @param {Object} [user] Some user.
  */
-Users.allowedAccess = function(userId) {
-  var user = Users.findOne(userId);
+Users.allowedAccess = function(user) {
   return user && user.isAccessDenied != true;
 }
 
@@ -290,7 +289,7 @@ Users.userIsForeign = function(user) {
 
 var _userRanks = {};
 /**
- * @summary Get the user rank. Ranks are numbers in ascending order starting from 1, 
+ * @summary Get the user rank. Ranks are numbers in ascending order starting from 1,
  * given to every user within a city, based on their registration date.
  * @locus Anywhere
  * @param {String|Object} [user] Some userId or user object.
@@ -311,7 +310,7 @@ Users.userRank = function(user) {
 }
 
 /**
- * @summary Display representation of user's *picture label* which will be visible in the profile picture of this user. 
+ * @summary Display representation of user's *picture label* which will be visible in the profile picture of this user.
  * The label will contain of one of the following information:
  *
  * * **merged with #id**, if user account is merged with an other one.
@@ -321,7 +320,7 @@ Users.userRank = function(user) {
  * * ***city name***, if user belongs to an other city.
  * * ***staff title***, in the case this user is an ambassador.
  * * otherwise the user rank (***#id***) is shown.
- * 
+ *
  * @locus Anywhere
  * @param {String|Object} [user] Some userId or user object.
  */
@@ -351,8 +350,8 @@ Users.userPictureLabel = function(user) {
  * * If user hasn't access to the site, **no access** (orange).
  * * If user isn't visible for normal users, **hidden** (orange).
  * * If user is an admin, **admin** (green).
- * * If user is an ambassador, **ambassador** (green). 
- * 
+ * * If user is an ambassador, **ambassador** (green).
+ *
  * @locus Anywhere
  * @param {String|Object} [user] Some userId or user object.
  */
@@ -430,7 +429,7 @@ Users.userSocialName = function(user, service) {
 /* find users */
 
 /**
- * @summary Get the user corresponding to the given unique bithash representation. 
+ * @summary Get the user corresponding to the given unique bithash representation.
  * The bitHash is used in URL's to indentify some user's profile page.
  * @locus Anywhere
  * @param {String} bitHash A bitHash representation string for some user.
diff --git a/web/packages/collection-users/users/hooks.js b/packages/collection-users/users/hooks.js
similarity index 100%
rename from web/packages/collection-users/users/hooks.js
rename to packages/collection-users/users/hooks.js
diff --git a/web/packages/collection-users/users/publish.js b/packages/collection-users/users/publish.js
similarity index 71%
rename from web/packages/collection-users/users/publish.js
rename to packages/collection-users/users/publish.js
index d49bfc2..293e5a8 100644
--- a/web/packages/collection-users/users/publish.js
+++ b/packages/collection-users/users/publish.js
@@ -11,6 +11,23 @@
 // and the privacy settings of the published user docs.
 // this will be handled by the filterUserFields function
 
+// exported user fields
+UserFields = {
+  // properties of the current logged in user that determine the user's permissions (in filterUserFields()).
+  // When one of these properties changes it affects the visible fields of other users.
+  // So when an dependency changes, we have to republish the whole collection to test
+  // each user doc against the new permission rights.
+  // Only first-level properties are allowed, such as 'profile', but NOT 'profile.name'
+  permissionDeps: [
+    '_id',
+    'isAccessDenied',
+    'isAdmin',
+    'city',
+    'currentCity',
+    'isAmbassador'
+  ]
+}
+
 var userFieldsGlobal = [
   "city",
   "currentCity",
@@ -70,23 +87,8 @@ var allUserFields = _.union(
   userFieldsCurrentUser
 );
 
-// properties of the current logged in user that determine the user's permissions (in filterUserFields()).
-// When one of these properties changes it affects the visible fields of other users.
-// So when an dependency changes, we have to republish the whole collection to test
-// each user doc against the new permission rights.
-// Only first-level properties are allowed, such as 'profile', but NOT 'profile.name'
-var permissionDeps = [
-  '_id',
-  'isAccessDenied',
-  'isAdmin',
-  'city',
-  'currentCity',
-  'isAmbassador'
-];
-
-
 // publish all fields of the logged in user
-Meteor.publish('currentUser', function() {
+Meteor.publish(null, function() {
   var fields = {
     "services": 0
   }
@@ -94,18 +96,60 @@ Meteor.publish('currentUser', function() {
 });
 
 
+
+// Here we publish specific users when client request them.
+// We haven't to check for permission in order to publish the users, because the local function 'publish' below
+// will remove all fields which may not been seen by the current logged in user.
+
+Meteor.publish('user', function(userId) {
+  return publish.call(this, {_id: userId});
+});
+
+Meteor.publish('userByBitHash', function(bitHash) {
+  var user = Users.userForBitHash(bitHash);
+  if (!user) return [];
+  return publish.call(this, {_id: user._id});
+});
+
+Meteor.publish('usersInvitedByUser', function(userId) {
+  var userIds = Invitations.find({broadcastUser: userId}, {fields: {receivingUser: 1}}).map(function(inv) { return inv.receivingUser; });
+  return publish.call(this, {_id: {$in: userIds}});
+});
+
+Meteor.publish('users', function(userIds) {
+  return publish.call(this, {_id: {$in: userIds}});
+});
+
+Meteor.publish('usersOfCity', function(city) {
+  return publish.call(this, {city: city});
+});
+
+Meteor.publish('usersOfHighlightsOfCity', function(city) {
+  var userIds = Highlights.find({$or: [{private: false}, {city: city}]}).map(function(x) { return x.userId; });
+  return publish.call(this, {_id: {$in: userIds}});
+});
+
+Meteor.publish('usersAll', function() {
+  return publish.call(this, {});
+});
+
+
 // publish specific fields of all users
-Meteor.publish('users', function() {
+var publish = function(selector) {
   var self = this;
   var queryOptions = {fields: Query.fieldsArray(allUserFields)};
 
   // initial permissions (can be changed below)
-  var permissions = Users.findOne(this.userId, {fields: Query.fieldsArray(permissionDeps)}) || {};
+  var permissions = Users.findOne(this.userId, {fields: Query.fieldsArray(UserFields.permissionDeps)}) || {};
+
+  if(!permissions || !Users.allowedAccess(permissions))
+    return [];
+
 
   // observe docs changes and push the changes to the client
   // only include fields that are allowed to publish, this can vary between users
   // and will be handled by the filterUserFields() function.
-  var observer = Users.find({}, queryOptions).observe({
+  var observer = Users.find(selector, queryOptions).observe({
     added: function(doc) {
       self.added('users', doc._id, excludeUserFields(permissions, doc, false));
     },
@@ -121,7 +165,7 @@ Meteor.publish('users', function() {
   // because permission of current user have changed
   var republish = function(newPermissions) {
     permissions = newPermissions; // ! set new permissions
-    Users.find({}, queryOptions).forEach(function(doc) {
+    Users.find(selector, queryOptions).forEach(function(doc) {
       self.changed('users', doc._id, excludeUserFields(permissions, doc, false));
     });
   }
@@ -129,7 +173,7 @@ Meteor.publish('users', function() {
   // Check if depended permissions fields from current user changes
   // if so, we have to republish the whole user collection
   if (self.userId)
-    var myObserver = Users.find({_id: self.userId}, {fields: Query.fieldsArray(permissionDeps)}).observe({'changed': republish});
+    var myObserver = Users.find({_id: self.userId}, {fields: Query.fieldsArray(UserFields.permissionDeps)}).observe({'changed': republish});
 
 
   // handlers
@@ -138,7 +182,7 @@ Meteor.publish('users', function() {
     if (myObserver) myObserver.stop();
   });
   self.ready();
-});
+};
 
 
 // determine which user fields to publish.
diff --git a/web/packages/collection-users/users/schema.js b/packages/collection-users/users/schema.js
similarity index 99%
rename from web/packages/collection-users/users/schema.js
rename to packages/collection-users/users/schema.js
index 5998de5..336e13f 100644
--- a/web/packages/collection-users/users/schema.js
+++ b/packages/collection-users/users/schema.js
@@ -102,6 +102,7 @@ Schemas.User = new SimpleSchema([Schemas.default, {
 
   "city": {             // the city where this hacker is registered to (lowercase)
     type: String,
+    index: 1,
     allowedValues: City.identifiers()
   },
   "currentCity": {      // the city this (admin) user is visiting
@@ -214,9 +215,3 @@ Users._transform = function(u) {
     u.bitHash = Url.bitHash(u.globalId);
   return u;
 }
-
-
-
-
-
-
diff --git a/web/packages/collection-users/users/tmpl-helpers.js b/packages/collection-users/users/tmpl-helpers.js
similarity index 100%
rename from web/packages/collection-users/users/tmpl-helpers.js
rename to packages/collection-users/users/tmpl-helpers.js
diff --git a/web/packages/collection-users/versions.json b/packages/collection-users/versions.json
similarity index 100%
rename from web/packages/collection-users/versions.json
rename to packages/collection-users/versions.json
diff --git a/web/packages/db-migrations/migrations/migrations.js b/packages/db-migrations/migrations/migrations.js
similarity index 100%
rename from web/packages/db-migrations/migrations/migrations.js
rename to packages/db-migrations/migrations/migrations.js
diff --git a/web/packages/db-migrations/migrations/run.js b/packages/db-migrations/migrations/run.js
similarity index 100%
rename from web/packages/db-migrations/migrations/run.js
rename to packages/db-migrations/migrations/run.js
diff --git a/web/packages/db-migrations/package.js b/packages/db-migrations/package.js
similarity index 100%
rename from web/packages/db-migrations/package.js
rename to packages/db-migrations/package.js
diff --git a/web/packages/db-migrations/versions.json b/packages/db-migrations/versions.json
similarity index 100%
rename from web/packages/db-migrations/versions.json
rename to packages/db-migrations/versions.json
diff --git a/web/packages/db-reset/dummy-db/Deals.js b/packages/db-reset/dummy-db/Deals.js
similarity index 100%
rename from web/packages/db-reset/dummy-db/Deals.js
rename to packages/db-reset/dummy-db/Deals.js
diff --git a/web/packages/db-reset/dummy-db/Highlights.js b/packages/db-reset/dummy-db/Highlights.js
similarity index 100%
rename from web/packages/db-reset/dummy-db/Highlights.js
rename to packages/db-reset/dummy-db/Highlights.js
diff --git a/web/packages/db-reset/dummy-db/Places.js b/packages/db-reset/dummy-db/Places.js
similarity index 100%
rename from web/packages/db-reset/dummy-db/Places.js
rename to packages/db-reset/dummy-db/Places.js
diff --git a/web/packages/db-reset/dummy-db/Users.js b/packages/db-reset/dummy-db/Users.js
similarity index 100%
rename from web/packages/db-reset/dummy-db/Users.js
rename to packages/db-reset/dummy-db/Users.js
diff --git a/web/packages/db-reset/package.js b/packages/db-reset/package.js
similarity index 100%
rename from web/packages/db-reset/package.js
rename to packages/db-reset/package.js
diff --git a/web/packages/db-reset/reset.js b/packages/db-reset/reset.js
similarity index 100%
rename from web/packages/db-reset/reset.js
rename to packages/db-reset/reset.js
diff --git a/web/packages/db-reset/versions.json b/packages/db-reset/versions.json
similarity index 100%
rename from web/packages/db-reset/versions.json
rename to packages/db-reset/versions.json
diff --git a/web/packages/email-mailing/mailing/mailing.jsdoc b/packages/email-mailing/mailing/mailing.jsdoc
similarity index 100%
rename from web/packages/email-mailing/mailing/mailing.jsdoc
rename to packages/email-mailing/mailing/mailing.jsdoc
diff --git a/web/packages/email-mailing/mailing/send.jsdoc b/packages/email-mailing/mailing/send.jsdoc
similarity index 99%
rename from web/packages/email-mailing/mailing/send.jsdoc
rename to packages/email-mailing/mailing/send.jsdoc
index d5284d0..66639dc 100644
--- a/web/packages/email-mailing/mailing/send.jsdoc
+++ b/packages/email-mailing/mailing/send.jsdoc
@@ -38,7 +38,7 @@ Mailing.send = function(options) {
   console.log('To users:', options.segments);
 
   // don't proceed on development machines
-  if (Settings['environment'] === 'dev')
+  if (Settings['environment'] === 'local')
     return;
 
   // on test environments, send always test e-mails. Never mail the users
diff --git a/web/packages/email-mailing/mailing/subscriptions.jsdoc b/packages/email-mailing/mailing/subscriptions.jsdoc
similarity index 87%
rename from web/packages/email-mailing/mailing/subscriptions.jsdoc
rename to packages/email-mailing/mailing/subscriptions.jsdoc
index 49a684f..71bb318 100644
--- a/web/packages/email-mailing/mailing/subscriptions.jsdoc
+++ b/packages/email-mailing/mailing/subscriptions.jsdoc
@@ -62,23 +62,23 @@ var _subscribe = function(options, cb) {
     send_welcome: false,
   };
 
-  // don't proceed on development machines
-  if (Settings['environment'] === 'dev')
+  // don't proceed on local machines
+  if (Settings['environment'] === 'local')
     return;
 
   new MailChimp().call('lists', 'subscribe', params, cb);
 }
 
 
-// only send 5 subscribe tasks simultaneous to MailChimp. 
+// only send 5 subscribe tasks simultaneous to MailChimp.
 var _queue = async.queue(Meteor.bindEnvironment(_subscribe), 3);
 
 Mailing.subscribe = function(user, options, cb) {
   options = options || {};
   options.user = user;
 
-  // don't proceed on development machines
-  if (Settings['environment'] === 'dev')
+  // don't proceed on local machines
+  if (Settings['environment'] === 'local')
     return;
 
   // queue subscribe task
@@ -87,10 +87,10 @@ Mailing.subscribe = function(user, options, cb) {
 
 Mailing.unsubscribe = function(emailToDelete, keepInList, cb) {
 
-  // don't proceed on development machines
-  if (Settings['environment'] === 'dev')
+  // don't proceed on local machines
+  if (Settings['environment'] === 'local')
     return;
-  
+
   var params = {
     id: MailChimpOptions['listId'],
     email: {email: emailToDelete},
@@ -109,7 +109,7 @@ Meteor.startup(function() {
   var initialized = false;
 
   var selector = {
-    "city": {$exists: true, $ne: ""}, 
+    "city": {$exists: true, $ne: ""},
     "profile.email": {$exists: true, $ne: ""}
   };
 
@@ -120,13 +120,13 @@ Meteor.startup(function() {
     },
     changed: function(newUser, oldUser) {
       var options = {};
-      
-      if (newUser.profile.email !== oldUser.profile.email) 
+
+      if (newUser.profile.email !== oldUser.profile.email)
         options.previousEmail = oldUser.profile.email;
 
       Mailing.subscribe(newUser, options);
     }
   });
 
-  initialized = true;  
+  initialized = true;
 });
diff --git a/web/packages/email-mailing/package.js b/packages/email-mailing/package.js
similarity index 100%
rename from web/packages/email-mailing/package.js
rename to packages/email-mailing/package.js
diff --git a/web/packages/email-mailing/versions.json b/packages/email-mailing/versions.json
similarity index 100%
rename from web/packages/email-mailing/versions.json
rename to packages/email-mailing/versions.json
diff --git a/web/packages/email-templates/HTMLEmailTemplates.js b/packages/email-templates/HTMLEmailTemplates.js
similarity index 100%
rename from web/packages/email-templates/HTMLEmailTemplates.js
rename to packages/email-templates/HTMLEmailTemplates.js
diff --git a/web/packages/email-templates/email-wrappers/html-email.html b/packages/email-templates/email-wrappers/html-email.html
similarity index 100%
rename from web/packages/email-templates/email-wrappers/html-email.html
rename to packages/email-templates/email-wrappers/html-email.html
diff --git a/web/packages/email-templates/package.js b/packages/email-templates/package.js
similarity index 100%
rename from web/packages/email-templates/package.js
rename to packages/email-templates/package.js
diff --git a/web/packages/email-templates/versions.json b/packages/email-templates/versions.json
similarity index 100%
rename from web/packages/email-templates/versions.json
rename to packages/email-templates/versions.json
diff --git a/web/packages/email-transactional/package.js b/packages/email-transactional/package.js
similarity index 100%
rename from web/packages/email-transactional/package.js
rename to packages/email-transactional/package.js
diff --git a/web/packages/email-transactional/transactional/config.js b/packages/email-transactional/transactional/config.js
similarity index 100%
rename from web/packages/email-transactional/transactional/config.js
rename to packages/email-transactional/transactional/config.js
diff --git a/web/packages/email-transactional/transactional/new-user.jsdoc b/packages/email-transactional/transactional/new-user.jsdoc
similarity index 100%
rename from web/packages/email-transactional/transactional/new-user.jsdoc
rename to packages/email-transactional/transactional/new-user.jsdoc
diff --git a/web/packages/email-transactional/transactional/verify-email.js b/packages/email-transactional/transactional/verify-email.js
similarity index 100%
rename from web/packages/email-transactional/transactional/verify-email.js
rename to packages/email-transactional/transactional/verify-email.js
diff --git a/web/packages/email-transactional/versions.json b/packages/email-transactional/versions.json
similarity index 100%
rename from web/packages/email-transactional/versions.json
rename to packages/email-transactional/versions.json
diff --git a/web/packages/ext-email/email/email-client.jsdoc b/packages/ext-email/email/email-client.jsdoc
similarity index 100%
rename from web/packages/ext-email/email/email-client.jsdoc
rename to packages/ext-email/email/email-client.jsdoc
diff --git a/web/packages/ext-email/email/email-server.jsdoc b/packages/ext-email/email/email-server.jsdoc
similarity index 81%
rename from web/packages/ext-email/email/email-server.jsdoc
rename to packages/ext-email/email/email-server.jsdoc
index bbb2f72..b398d6a 100644
--- a/web/packages/ext-email/email/email-server.jsdoc
+++ b/packages/ext-email/email/email-server.jsdoc
@@ -11,7 +11,7 @@ Email.send = function(options, forceSendingInDevelopMode) {
 
   // In development mode emails will be outputed to console
   // as long the user don't specify the flag forceSendingInDevelopMode
-  if (Settings['environment'] === 'dev' || (Settings['environment'] !== 'production' && !forceSendingInDevelopMode))
+  if (Settings['environment'] === 'local' || (Settings['environment'] !== 'production' && !forceSendingInDevelopMode))
     console.log("SEND EMAIL:\n", options); // output in console
   else
     _EmailSend(options); // sending email over smtp
@@ -20,11 +20,11 @@ Email.send = function(options, forceSendingInDevelopMode) {
 
 Meteor.methods({
   'EmailSend': function(options, forceSendingInDevelopMode) {
-    if (!self.Users) 
+    if (!self.Users)
       throw new Meteor.Error(500, 'Users package not included.');
     else {
       Users.checkAmbassadorPermission();
-      Email.send(options, forceSendingInDevelopMode);   
+      Email.send(options, forceSendingInDevelopMode);
     }
   }
 })
\ No newline at end of file
diff --git a/web/packages/ext-email/package.js b/packages/ext-email/package.js
similarity index 100%
rename from web/packages/ext-email/package.js
rename to packages/ext-email/package.js
diff --git a/web/packages/ext-email/versions.json b/packages/ext-email/versions.json
similarity index 100%
rename from web/packages/ext-email/versions.json
rename to packages/ext-email/versions.json
diff --git a/web/packages/ext-jquery/package.js b/packages/ext-jquery/package.js
similarity index 100%
rename from web/packages/ext-jquery/package.js
rename to packages/ext-jquery/package.js
diff --git a/web/packages/ext-jquery/plugins/autogrow.js b/packages/ext-jquery/plugins/autogrow.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/autogrow.js
rename to packages/ext-jquery/plugins/autogrow.js
diff --git a/web/packages/ext-jquery/plugins/browserDetect.js b/packages/ext-jquery/plugins/browserDetect.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/browserDetect.js
rename to packages/ext-jquery/plugins/browserDetect.js
diff --git a/web/packages/ext-jquery/plugins/chosen.css b/packages/ext-jquery/plugins/chosen.css
similarity index 100%
rename from web/packages/ext-jquery/plugins/chosen.css
rename to packages/ext-jquery/plugins/chosen.css
diff --git a/web/packages/ext-jquery/plugins/chosen.js b/packages/ext-jquery/plugins/chosen.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/chosen.js
rename to packages/ext-jquery/plugins/chosen.js
diff --git a/web/packages/ext-jquery/plugins/onepage-scroll.css b/packages/ext-jquery/plugins/onepage-scroll.css
similarity index 100%
rename from web/packages/ext-jquery/plugins/onepage-scroll.css
rename to packages/ext-jquery/plugins/onepage-scroll.css
diff --git a/web/packages/ext-jquery/plugins/onepage-scroll.js b/packages/ext-jquery/plugins/onepage-scroll.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/onepage-scroll.js
rename to packages/ext-jquery/plugins/onepage-scroll.js
diff --git a/web/packages/ext-jquery/plugins/onscreen.js b/packages/ext-jquery/plugins/onscreen.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/onscreen.js
rename to packages/ext-jquery/plugins/onscreen.js
diff --git a/web/packages/ext-jquery/plugins/scrollTo.js b/packages/ext-jquery/plugins/scrollTo.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/scrollTo.js
rename to packages/ext-jquery/plugins/scrollTo.js
diff --git a/web/packages/ext-jquery/plugins/scrollspy.js b/packages/ext-jquery/plugins/scrollspy.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/scrollspy.js
rename to packages/ext-jquery/plugins/scrollspy.js
diff --git a/web/packages/ext-jquery/plugins/scrollstop.js b/packages/ext-jquery/plugins/scrollstop.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/scrollstop.js
rename to packages/ext-jquery/plugins/scrollstop.js
diff --git a/web/packages/ext-jquery/plugins/serializeObject.js b/packages/ext-jquery/plugins/serializeObject.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/serializeObject.js
rename to packages/ext-jquery/plugins/serializeObject.js
diff --git a/web/packages/ext-jquery/plugins/typewriter.js b/packages/ext-jquery/plugins/typewriter.js
similarity index 100%
rename from web/packages/ext-jquery/plugins/typewriter.js
rename to packages/ext-jquery/plugins/typewriter.js
diff --git a/web/packages/ext-jquery/versions.json b/packages/ext-jquery/versions.json
similarity index 100%
rename from web/packages/ext-jquery/versions.json
rename to packages/ext-jquery/versions.json
diff --git a/web/packages/ext-match/match.js b/packages/ext-match/match.js
similarity index 100%
rename from web/packages/ext-match/match.js
rename to packages/ext-match/match.js
diff --git a/web/packages/ext-match/package.js b/packages/ext-match/package.js
similarity index 100%
rename from web/packages/ext-match/package.js
rename to packages/ext-match/package.js
diff --git a/web/packages/ext-match/versions.json b/packages/ext-match/versions.json
similarity index 100%
rename from web/packages/ext-match/versions.json
rename to packages/ext-match/versions.json
diff --git a/web/packages/ext-oauth/oauth.jsdoc b/packages/ext-oauth/oauth.jsdoc
similarity index 100%
rename from web/packages/ext-oauth/oauth.jsdoc
rename to packages/ext-oauth/oauth.jsdoc
diff --git a/web/packages/ext-oauth/package.js b/packages/ext-oauth/package.js
similarity index 100%
rename from web/packages/ext-oauth/package.js
rename to packages/ext-oauth/package.js
diff --git a/web/packages/ext-oauth/relax-domain.js b/packages/ext-oauth/relax-domain.js
similarity index 100%
rename from web/packages/ext-oauth/relax-domain.js
rename to packages/ext-oauth/relax-domain.js
diff --git a/web/packages/ext-oauth/versions.json b/packages/ext-oauth/versions.json
similarity index 100%
rename from web/packages/ext-oauth/versions.json
rename to packages/ext-oauth/versions.json
diff --git a/web/packages/ext-random/package.js b/packages/ext-random/package.js
similarity index 100%
rename from web/packages/ext-random/package.js
rename to packages/ext-random/package.js
diff --git a/web/packages/ext-random/random.js b/packages/ext-random/random.js
similarity index 100%
rename from web/packages/ext-random/random.js
rename to packages/ext-random/random.js
diff --git a/web/packages/ext-random/versions.json b/packages/ext-random/versions.json
similarity index 100%
rename from web/packages/ext-random/versions.json
rename to packages/ext-random/versions.json
diff --git a/web/packages/ext-underscore/mixins/deep.js b/packages/ext-underscore/mixins/deep.js
similarity index 100%
rename from web/packages/ext-underscore/mixins/deep.js
rename to packages/ext-underscore/mixins/deep.js
diff --git a/web/packages/ext-underscore/mixins/deepExtend.js b/packages/ext-underscore/mixins/deepExtend.js
similarity index 100%
rename from web/packages/ext-underscore/mixins/deepExtend.js
rename to packages/ext-underscore/mixins/deepExtend.js
diff --git a/web/packages/ext-underscore/mixins/deepPick.js b/packages/ext-underscore/mixins/deepPick.js
similarity index 100%
rename from web/packages/ext-underscore/mixins/deepPick.js
rename to packages/ext-underscore/mixins/deepPick.js
diff --git a/web/packages/ext-underscore/mixins/deepPluck.js b/packages/ext-underscore/mixins/deepPluck.js
similarity index 100%
rename from web/packages/ext-underscore/mixins/deepPluck.js
rename to packages/ext-underscore/mixins/deepPluck.js
diff --git a/web/packages/ext-underscore/mixins/func.js b/packages/ext-underscore/mixins/func.js
similarity index 100%
rename from web/packages/ext-underscore/mixins/func.js
rename to packages/ext-underscore/mixins/func.js
diff --git a/web/packages/ext-underscore/mixins/pickRename.js b/packages/ext-underscore/mixins/pickRename.js
similarity index 100%
rename from web/packages/ext-underscore/mixins/pickRename.js
rename to packages/ext-underscore/mixins/pickRename.js
diff --git a/web/packages/ext-underscore/mixins/property.js b/packages/ext-underscore/mixins/property.js
similarity index 100%
rename from web/packages/ext-underscore/mixins/property.js
rename to packages/ext-underscore/mixins/property.js
diff --git a/web/packages/ext-underscore/package.js b/packages/ext-underscore/package.js
similarity index 100%
rename from web/packages/ext-underscore/package.js
rename to packages/ext-underscore/package.js
diff --git a/web/packages/ext-underscore/versions.json b/packages/ext-underscore/versions.json
similarity index 100%
rename from web/packages/ext-underscore/versions.json
rename to packages/ext-underscore/versions.json
diff --git a/web/packages/growth/growth/crawler-client.js b/packages/growth/growth/crawler-client.js
similarity index 100%
rename from web/packages/growth/growth/crawler-client.js
rename to packages/growth/growth/crawler-client.js
diff --git a/web/packages/growth/growth/crawler-server.js b/packages/growth/growth/crawler-server.js
similarity index 91%
rename from web/packages/growth/growth/crawler-server.js
rename to packages/growth/growth/crawler-server.js
index f184f58..1d04b7b 100644
--- a/web/packages/growth/growth/crawler-server.js
+++ b/packages/growth/growth/crawler-server.js
@@ -35,8 +35,12 @@ var fetchGithubUsersInCity = function(city) {
 
 var forEachQueriedUser = function(query, page, iterator, cb) {
 
-  // if (page > 10)
-  //   return cb && cb();
+  // Github only present the first 1000 search results.
+  // We should stop after retrieving 1000 results.
+  // A better way is to make the search more specific to find all users in a city.
+  // For example we can alphabetic search usernames, so we can get 1000 results per letter.
+  if (page > 10)
+    return cb && cb();
 
   console.log('fetch github search', query, page);
 
diff --git a/web/packages/growth/growth/growth.js b/packages/growth/growth/growth.js
similarity index 98%
rename from web/packages/growth/growth/growth.js
rename to packages/growth/growth/growth.js
index 5ee2d66..55048cf 100644
--- a/web/packages/growth/growth/growth.js
+++ b/packages/growth/growth/growth.js
@@ -128,8 +128,8 @@ var githubGrowthMail = function(city, userIds, subjectIdentifier, bodyIdentifier
     console.log('Because you are on a development environment, this email will be only send to you. Users will not receive them.');
   }
 
-  // don't proceed on development machines
-  if (Settings['environment'] === 'dev')
+  // don't proceed on local machines
+  if (Settings['environment'] === 'local')
     return;
 
   // send email
diff --git a/web/packages/growth/package.js b/packages/growth/package.js
similarity index 100%
rename from web/packages/growth/package.js
rename to packages/growth/package.js
diff --git a/web/packages/growth/versions.json b/packages/growth/versions.json
similarity index 100%
rename from web/packages/growth/versions.json
rename to packages/growth/versions.json
diff --git a/web/packages/hckrs/package.js b/packages/hckrs/package.js
similarity index 100%
rename from web/packages/hckrs/package.js
rename to packages/hckrs/package.js
diff --git a/web/packages/hckrs/versions.json b/packages/hckrs/versions.json
similarity index 100%
rename from web/packages/hckrs/versions.json
rename to packages/hckrs/versions.json
diff --git a/web/packages/settings/package.js b/packages/settings/package.js
similarity index 100%
rename from web/packages/settings/package.js
rename to packages/settings/package.js
diff --git a/web/packages/settings/settings/settings-server.js b/packages/settings/settings/settings-server.js
similarity index 100%
rename from web/packages/settings/settings/settings-server.js
rename to packages/settings/settings/settings-server.js
diff --git a/web/packages/settings/settings/settings.jsdoc b/packages/settings/settings/settings.jsdoc
similarity index 100%
rename from web/packages/settings/settings/settings.jsdoc
rename to packages/settings/settings/settings.jsdoc
diff --git a/web/packages/settings/versions.json b/packages/settings/versions.json
similarity index 100%
rename from web/packages/settings/versions.json
rename to packages/settings/versions.json
diff --git a/web/packages/tmpl-helpers/package.js b/packages/tmpl-helpers/package.js
similarity index 100%
rename from web/packages/tmpl-helpers/package.js
rename to packages/tmpl-helpers/package.js
diff --git a/web/packages/tmpl-helpers/tmpl-helpers.jsdoc b/packages/tmpl-helpers/tmpl-helpers.jsdoc
similarity index 100%
rename from web/packages/tmpl-helpers/tmpl-helpers.jsdoc
rename to packages/tmpl-helpers/tmpl-helpers.jsdoc
diff --git a/web/packages/tmpl-helpers/versions.json b/packages/tmpl-helpers/versions.json
similarity index 100%
rename from web/packages/tmpl-helpers/versions.json
rename to packages/tmpl-helpers/versions.json
diff --git a/web/packages/util-base-array/array.jsdoc b/packages/util-base-array/array.jsdoc
similarity index 100%
rename from web/packages/util-base-array/array.jsdoc
rename to packages/util-base-array/array.jsdoc
diff --git a/web/packages/util-base-array/package.js b/packages/util-base-array/package.js
similarity index 100%
rename from web/packages/util-base-array/package.js
rename to packages/util-base-array/package.js
diff --git a/web/packages/util-base-array/versions.json b/packages/util-base-array/versions.json
similarity index 100%
rename from web/packages/util-base-array/versions.json
rename to packages/util-base-array/versions.json
diff --git a/web/packages/util-base-number/number.jsdoc b/packages/util-base-number/number.jsdoc
similarity index 100%
rename from web/packages/util-base-number/number.jsdoc
rename to packages/util-base-number/number.jsdoc
diff --git a/web/packages/util-base-number/package.js b/packages/util-base-number/package.js
similarity index 100%
rename from web/packages/util-base-number/package.js
rename to packages/util-base-number/package.js
diff --git a/web/packages/util-base-number/versions.json b/packages/util-base-number/versions.json
similarity index 100%
rename from web/packages/util-base-number/versions.json
rename to packages/util-base-number/versions.json
diff --git a/web/packages/util-base-object/object.jsdoc b/packages/util-base-object/object.jsdoc
similarity index 100%
rename from web/packages/util-base-object/object.jsdoc
rename to packages/util-base-object/object.jsdoc
diff --git a/web/packages/util-base-object/package.js b/packages/util-base-object/package.js
similarity index 100%
rename from web/packages/util-base-object/package.js
rename to packages/util-base-object/package.js
diff --git a/web/packages/util-base-object/versions.json b/packages/util-base-object/versions.json
similarity index 100%
rename from web/packages/util-base-object/versions.json
rename to packages/util-base-object/versions.json
diff --git a/web/packages/util-base-query/package.js b/packages/util-base-query/package.js
similarity index 100%
rename from web/packages/util-base-query/package.js
rename to packages/util-base-query/package.js
diff --git a/web/packages/util-base-query/query.jsdoc b/packages/util-base-query/query.jsdoc
similarity index 100%
rename from web/packages/util-base-query/query.jsdoc
rename to packages/util-base-query/query.jsdoc
diff --git a/web/packages/util-base-query/versions.json b/packages/util-base-query/versions.json
similarity index 100%
rename from web/packages/util-base-query/versions.json
rename to packages/util-base-query/versions.json
diff --git a/web/packages/util-base-string/package.js b/packages/util-base-string/package.js
similarity index 100%
rename from web/packages/util-base-string/package.js
rename to packages/util-base-string/package.js
diff --git a/web/packages/util-base-string/string.jsdoc b/packages/util-base-string/string.jsdoc
similarity index 100%
rename from web/packages/util-base-string/string.jsdoc
rename to packages/util-base-string/string.jsdoc
diff --git a/web/packages/util-base-string/versions.json b/packages/util-base-string/versions.json
similarity index 100%
rename from web/packages/util-base-string/versions.json
rename to packages/util-base-string/versions.json
diff --git a/web/packages/util-base-time/package.js b/packages/util-base-time/package.js
similarity index 100%
rename from web/packages/util-base-time/package.js
rename to packages/util-base-time/package.js
diff --git a/web/packages/util-base-time/time.jsdoc b/packages/util-base-time/time.jsdoc
similarity index 100%
rename from web/packages/util-base-time/time.jsdoc
rename to packages/util-base-time/time.jsdoc
diff --git a/web/packages/util-base-time/versions.json b/packages/util-base-time/versions.json
similarity index 100%
rename from web/packages/util-base-time/versions.json
rename to packages/util-base-time/versions.json
diff --git a/web/packages/util-base/package.js b/packages/util-base/package.js
similarity index 100%
rename from web/packages/util-base/package.js
rename to packages/util-base/package.js
diff --git a/web/packages/util-base/versions.json b/packages/util-base/versions.json
similarity index 100%
rename from web/packages/util-base/versions.json
rename to packages/util-base/versions.json
diff --git a/web/packages/util-geo/geo.jsdoc b/packages/util-geo/geo.jsdoc
similarity index 91%
rename from web/packages/util-geo/geo.jsdoc
rename to packages/util-geo/geo.jsdoc
index 0c33db7..9e77202 100644
--- a/web/packages/util-geo/geo.jsdoc
+++ b/packages/util-geo/geo.jsdoc
@@ -31,7 +31,7 @@ Geo = {}
 Geo.geocode = function(address, cb) {
   var url = "http://api.tiles.mapbox.com/v4/geocode/mapbox.places-v1/"+address+".json";
   var options = {params: { format: "json", access_token: Settings['mapbox'].token }};
-  
+
   var response = function(res) {
     var data = res && res.content && JSON.parse(res.content);
     var feature = data && data.features && data.features[0];
@@ -39,7 +39,7 @@ Geo.geocode = function(address, cb) {
     if (center)
       return { lat: center[1], lng: center[0] };
   }
-  
+
   if (Meteor.isServer)
     return response(HTTP.get(url, options));
   else
@@ -73,13 +73,13 @@ Geo.getDistanceFromLatLonObj = function(latlong1, latlong2) {
 Geo.getDistanceFromLatLon = function(lat1,lon1,lat2,lon2) {
   var R = 6371; // Radius of the earth in km
   var dLat = Geo.deg2rad(lat2-lat1);  // deg2rad below
-  var dLon = Geo.deg2rad(lon2-lon1); 
-  var a = 
+  var dLon = Geo.deg2rad(lon2-lon1);
+  var a =
     Math.sin(dLat/2) * Math.sin(dLat/2) +
-    Math.cos(Geo.deg2rad(lat1)) * Math.cos(Geo.deg2rad(lat2)) * 
+    Math.cos(Geo.deg2rad(lat1)) * Math.cos(Geo.deg2rad(lat2)) *
     Math.sin(dLon/2) * Math.sin(dLon/2)
-    ; 
-  var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a)); 
+    ;
+  var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
   var d = R * c; // Distance in km
   return d; // km
 }
@@ -104,10 +104,13 @@ Geo.deg2rad = function(deg) {
  *   ```
  */
 Geo.requestLocationForIp = function(ip) {
-  if (ip === "127.0.0.1") 
+  if (ip === "127.0.0.1")
     ip = ""; // if on localhost, let telize determine my ip.
   try {
-    var data = HTTP.get("http://www.telize.com/geoip/" + ip, {timeout: 2000}).data;
+    var url = "http://www.telize.com/geoip/" + ip; // service discontinued since 15th november 2015
+    url = "http://freegeoip.net/json/" + ip;
+
+    var data = HTTP.get(url, {timeout: 2000}).data;
     return _.pick(data, 'longitude', 'latitude');
   } catch(err) {
     console.log("request client-IP error:", err);
diff --git a/web/packages/util-geo/package.js b/packages/util-geo/package.js
similarity index 100%
rename from web/packages/util-geo/package.js
rename to packages/util-geo/package.js
diff --git a/web/packages/util-geo/versions.json b/packages/util-geo/versions.json
similarity index 100%
rename from web/packages/util-geo/versions.json
rename to packages/util-geo/versions.json
diff --git a/web/packages/util-url/package.js b/packages/util-url/package.js
similarity index 100%
rename from web/packages/util-url/package.js
rename to packages/util-url/package.js
diff --git a/web/packages/util-url/url.jsdoc b/packages/util-url/url.jsdoc
similarity index 92%
rename from web/packages/util-url/url.jsdoc
rename to packages/util-url/url.jsdoc
index feef199..c72bfab 100644
--- a/web/packages/util-url/url.jsdoc
+++ b/packages/util-url/url.jsdoc
@@ -11,7 +11,7 @@ Url = {}
  * @locus Anywhere
  * @example
  *   ```
- *   Url.city("http://utrecht.staging.hckrs.io")
+ *   Url.city("http://utrecht.dev.hckrs.io")
  *   => utrecht
  *   ```
  */
@@ -28,8 +28,8 @@ Url.city = function(url) {
  * @locus Anywhere
  * @example
  *   ```
- *   Url.replaceCity("http://www.staging.hckrs.io") 
- *   => http://lyon.staging.hckrs.io
+ *   Url.replaceCity("http://www.dev.hckrs.io")
+ *   => http://lyon.dev.hckrs.io
  *   ```
  */
 Url.replaceCity = function(city, url) {
@@ -120,8 +120,8 @@ Url.bitHashInv = function(hash) {
  * @locus Anywhere
  * @example
  *   ```
- *   // staging server
- *   Url.root();  => staging.hckrs.io
+ *   // dev server
+ *   Url.root();  => dev.hckrs.io
  *
  *   // production server
  *   Url.root();  => hckrs.io
@@ -138,8 +138,8 @@ Url.root = function() {
  * @locus Anywhere
  * @example
  *   ```
- *   Url.hostname("http://lyon.staging.hckrs.io/-_-");  
- *   => lyon.staging.hckrs.io
+ *   Url.hostname("http://lyon.dev.hckrs.io/-_-");
+ *   => lyon.dev.hckrs.io
  *   ```
  */
 Url.hostname = function(url) {
@@ -153,8 +153,8 @@ Url.hostname = function(url) {
  * @locus Anywhere
  * @example
  *   ```
- *   Url.baseUrl("http://lyon.staging.hckrs.io/-_-");  
- *   => http://lyon.staging.hckrs.io
+ *   Url.baseUrl("http://lyon.dev.hckrs.io/-_-");
+ *   => http://lyon.dev.hckrs.io
  *   ```
  */
 Url.baseUrl = function(url) {
@@ -169,7 +169,7 @@ Url.baseUrl = function(url) {
  * @locus Anywhere
  * @example
  *   ```
- *   Url.domain("http://lyon.staging.hckrs.io/-_-");  
+ *   Url.domain("http://lyon.dev.hckrs.io/-_-");
  *   => hckrs.io
  *   ```
  */
@@ -185,8 +185,8 @@ Url.domain = function(url) {
  * @locus Anywhere
  * @example
  *   ```
- *   Url.show("http://lyon.staging.hckrs.io/-_-");  
- *   => lyon.staging.hckrs.io/-_-
+ *   Url.show("http://lyon.dev.hckrs.io/-_-");
+ *   => lyon.dev.hckrs.io/-_-
  *   ```
  */
 Url.show = function(url) {
@@ -200,8 +200,8 @@ Url.show = function(url) {
  * @locus Anywhere
  * @example
  *   ```
- *   Url.externUrl("lyon.staging.hckrs.io/-_-");  
- *   => http://lyon.staging.hckrs.io/-_-
+ *   Url.externUrl("lyon.dev.hckrs.io/-_-");
+ *   => http://lyon.dev.hckrs.io/-_-
  *   ```
  */
 Url.externUrl = function(url) {
@@ -234,7 +234,7 @@ Url.addParams = function(properties, url) {
   return Url.replace(url, function(o) {
     o.search = searchString;
     return o;
-  });  
+  });
 }
 
 /**
@@ -279,8 +279,8 @@ Url.removeParam = function(key, url) {
 /**
  * @summary This function will parse a url and give it to the specified delegate function.arsing and will give the parsed url to the delegate function.
  * The delegate function can modify the url object and give it back. This functional will format it again to make a url string.
- * you can ONLY edit the following properties: 
- * 
+ * you can ONLY edit the following properties:
+ *
  * * protocol
  * * host
  * * pathname
@@ -334,7 +334,7 @@ if (Meteor.isClient) {
     parser.pathname; // => "/pathname/"
     parser.search;   // => "?search=test"
     parser.hash;     // => "#hash"
-    parser.host;     // => "example.com:3000"  
+    parser.host;     // => "example.com:3000"
     return parser;
   }
 
diff --git a/web/packages/util-url/versions.json b/packages/util-url/versions.json
similarity index 100%
rename from web/packages/util-url/versions.json
rename to packages/util-url/versions.json
diff --git a/web/packages/util/package.js b/packages/util/package.js
similarity index 100%
rename from web/packages/util/package.js
rename to packages/util/package.js
diff --git a/web/packages/util/util/util.jsdoc b/packages/util/util/util.jsdoc
similarity index 100%
rename from web/packages/util/util/util.jsdoc
rename to packages/util/util/util.jsdoc
diff --git a/web/packages/util/versions.json b/packages/util/versions.json
similarity index 100%
rename from web/packages/util/versions.json
rename to packages/util/versions.json
diff --git a/web/packages/yql/package.js b/packages/yql/package.js
similarity index 100%
rename from web/packages/yql/package.js
rename to packages/yql/package.js
diff --git a/web/packages/yql/versions.json b/packages/yql/versions.json
similarity index 100%
rename from web/packages/yql/versions.json
rename to packages/yql/versions.json
diff --git a/web/packages/yql/yql.js b/packages/yql/yql.js
similarity index 100%
rename from web/packages/yql/yql.js
rename to packages/yql/yql.js
diff --git a/web/public/2f7cfb5719f52aa5bea20c51c910c78e.txt b/public/2f7cfb5719f52aa5bea20c51c910c78e.txt
similarity index 100%
rename from web/public/2f7cfb5719f52aa5bea20c51c910c78e.txt
rename to public/2f7cfb5719f52aa5bea20c51c910c78e.txt
diff --git a/web/public/fonts/Tiempos Headline/headline-bold.otf b/public/fonts/Tiempos Headline/headline-bold.otf
similarity index 100%
rename from web/public/fonts/Tiempos Headline/headline-bold.otf
rename to public/fonts/Tiempos Headline/headline-bold.otf
diff --git a/web/public/fonts/Tiempos Headline/headline-regular.otf b/public/fonts/Tiempos Headline/headline-regular.otf
similarity index 100%
rename from web/public/fonts/Tiempos Headline/headline-regular.otf
rename to public/fonts/Tiempos Headline/headline-regular.otf
diff --git a/web/public/fonts/Tiempos Text/text-Italic.otf b/public/fonts/Tiempos Text/text-Italic.otf
similarity index 100%
rename from web/public/fonts/Tiempos Text/text-Italic.otf
rename to public/fonts/Tiempos Text/text-Italic.otf
diff --git a/web/public/fonts/Tiempos Text/text-bold-italic.otf b/public/fonts/Tiempos Text/text-bold-italic.otf
similarity index 100%
rename from web/public/fonts/Tiempos Text/text-bold-italic.otf
rename to public/fonts/Tiempos Text/text-bold-italic.otf
diff --git a/web/public/fonts/Tiempos Text/text-bold.otf b/public/fonts/Tiempos Text/text-bold.otf
similarity index 100%
rename from web/public/fonts/Tiempos Text/text-bold.otf
rename to public/fonts/Tiempos Text/text-bold.otf
diff --git a/web/public/fonts/Tiempos Text/text-regular.otf b/public/fonts/Tiempos Text/text-regular.otf
similarity index 100%
rename from web/public/fonts/Tiempos Text/text-regular.otf
rename to public/fonts/Tiempos Text/text-regular.otf
diff --git a/web/public/img/_icon-article.svg b/public/img/_icon-article.svg
similarity index 100%
rename from web/public/img/_icon-article.svg
rename to public/img/_icon-article.svg
diff --git a/web/public/img/backgrounds/_default.jpg b/public/img/backgrounds/_default.jpg
similarity index 100%
rename from web/public/img/backgrounds/_default.jpg
rename to public/img/backgrounds/_default.jpg
diff --git a/web/public/img/backgrounds/default.jpg b/public/img/backgrounds/default.jpg
similarity index 100%
rename from web/public/img/backgrounds/default.jpg
rename to public/img/backgrounds/default.jpg
diff --git a/web/public/img/backgrounds/default_night.jpg b/public/img/backgrounds/default_night.jpg
similarity index 100%
rename from web/public/img/backgrounds/default_night.jpg
rename to public/img/backgrounds/default_night.jpg
diff --git a/web/public/img/backgrounds/lyon.jpg b/public/img/backgrounds/lyon.jpg
similarity index 100%
rename from web/public/img/backgrounds/lyon.jpg
rename to public/img/backgrounds/lyon.jpg
diff --git a/web/public/img/backgrounds/lyon_night.jpg b/public/img/backgrounds/lyon_night.jpg
similarity index 100%
rename from web/public/img/backgrounds/lyon_night.jpg
rename to public/img/backgrounds/lyon_night.jpg
diff --git a/web/public/img/books/BusinessModelGeneration.png b/public/img/books/BusinessModelGeneration.png
similarity index 100%
rename from web/public/img/books/BusinessModelGeneration.png
rename to public/img/books/BusinessModelGeneration.png
diff --git a/web/public/img/books/CrushIt.png b/public/img/books/CrushIt.png
similarity index 100%
rename from web/public/img/books/CrushIt.png
rename to public/img/books/CrushIt.png
diff --git a/web/public/img/books/Execute.jpg b/public/img/books/Execute.jpg
similarity index 100%
rename from web/public/img/books/Execute.jpg
rename to public/img/books/Execute.jpg
diff --git a/web/public/img/books/GettingReal.jpg b/public/img/books/GettingReal.jpg
similarity index 100%
rename from web/public/img/books/GettingReal.jpg
rename to public/img/books/GettingReal.jpg
diff --git a/web/public/img/books/IgnoreEverybody.jpg b/public/img/books/IgnoreEverybody.jpg
similarity index 100%
rename from web/public/img/books/IgnoreEverybody.jpg
rename to public/img/books/IgnoreEverybody.jpg
diff --git a/web/public/img/books/JabJabJabRightHook.jpg b/public/img/books/JabJabJabRightHook.jpg
similarity index 100%
rename from web/public/img/books/JabJabJabRightHook.jpg
rename to public/img/books/JabJabJabRightHook.jpg
diff --git a/web/public/img/books/LeanAnalytics.jpg b/public/img/books/LeanAnalytics.jpg
similarity index 100%
rename from web/public/img/books/LeanAnalytics.jpg
rename to public/img/books/LeanAnalytics.jpg
diff --git a/web/public/img/books/Linchpin.jpg b/public/img/books/Linchpin.jpg
similarity index 100%
rename from web/public/img/books/Linchpin.jpg
rename to public/img/books/Linchpin.jpg
diff --git a/web/public/img/books/PurpleCow.jpg b/public/img/books/PurpleCow.jpg
similarity index 100%
rename from web/public/img/books/PurpleCow.jpg
rename to public/img/books/PurpleCow.jpg
diff --git a/web/public/img/books/Remote.png b/public/img/books/Remote.png
similarity index 100%
rename from web/public/img/books/Remote.png
rename to public/img/books/Remote.png
diff --git a/web/public/img/books/Rework.jpg b/public/img/books/Rework.jpg
similarity index 100%
rename from web/public/img/books/Rework.jpg
rename to public/img/books/Rework.jpg
diff --git a/web/public/img/books/RunningLean.jpg b/public/img/books/RunningLean.jpg
similarity index 100%
rename from web/public/img/books/RunningLean.jpg
rename to public/img/books/RunningLean.jpg
diff --git a/web/public/img/books/The4HourWorkWeek.jpg b/public/img/books/The4HourWorkWeek.jpg
similarity index 100%
rename from web/public/img/books/The4HourWorkWeek.jpg
rename to public/img/books/The4HourWorkWeek.jpg
diff --git a/web/public/img/books/TheEnetrepreneurMind.jpg b/public/img/books/TheEnetrepreneurMind.jpg
similarity index 100%
rename from web/public/img/books/TheEnetrepreneurMind.jpg
rename to public/img/books/TheEnetrepreneurMind.jpg
diff --git a/web/public/img/books/TheLeanStartup.jpg b/public/img/books/TheLeanStartup.jpg
similarity index 100%
rename from web/public/img/books/TheLeanStartup.jpg
rename to public/img/books/TheLeanStartup.jpg
diff --git a/web/public/img/books/TheThankYouEconomy.jpg b/public/img/books/TheThankYouEconomy.jpg
similarity index 100%
rename from web/public/img/books/TheThankYouEconomy.jpg
rename to public/img/books/TheThankYouEconomy.jpg
diff --git a/web/public/img/books/Tribes.jpg b/public/img/books/Tribes.jpg
similarity index 100%
rename from web/public/img/books/Tribes.jpg
rename to public/img/books/Tribes.jpg
diff --git a/web/public/img/caution-bar.png b/public/img/caution-bar.png
similarity index 100%
rename from web/public/img/caution-bar.png
rename to public/img/caution-bar.png
diff --git a/web/public/img/chosen-sprite.png b/public/img/chosen-sprite.png
similarity index 100%
rename from web/public/img/chosen-sprite.png
rename to public/img/chosen-sprite.png
diff --git a/web/public/img/chosen-sprite@2x.png b/public/img/chosen-sprite@2x.png
similarity index 100%
rename from web/public/img/chosen-sprite@2x.png
rename to public/img/chosen-sprite@2x.png
diff --git a/web/public/img/close.svg b/public/img/close.svg
similarity index 100%
rename from web/public/img/close.svg
rename to public/img/close.svg
diff --git a/web/public/img/drop-down-arrow.svg b/public/img/drop-down-arrow.svg
similarity index 100%
rename from web/public/img/drop-down-arrow.svg
rename to public/img/drop-down-arrow.svg
diff --git a/web/public/img/favicon.png b/public/img/favicon.png
similarity index 100%
rename from web/public/img/favicon.png
rename to public/img/favicon.png
diff --git a/web/public/img/favicons/apple-touch-icon-114x114.png b/public/img/favicons/apple-touch-icon-114x114.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-114x114.png
rename to public/img/favicons/apple-touch-icon-114x114.png
diff --git a/web/public/img/favicons/apple-touch-icon-120x120.png b/public/img/favicons/apple-touch-icon-120x120.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-120x120.png
rename to public/img/favicons/apple-touch-icon-120x120.png
diff --git a/web/public/img/favicons/apple-touch-icon-144x144.png b/public/img/favicons/apple-touch-icon-144x144.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-144x144.png
rename to public/img/favicons/apple-touch-icon-144x144.png
diff --git a/web/public/img/favicons/apple-touch-icon-152x152.png b/public/img/favicons/apple-touch-icon-152x152.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-152x152.png
rename to public/img/favicons/apple-touch-icon-152x152.png
diff --git a/web/public/img/favicons/apple-touch-icon-57x57.png b/public/img/favicons/apple-touch-icon-57x57.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-57x57.png
rename to public/img/favicons/apple-touch-icon-57x57.png
diff --git a/web/public/img/favicons/apple-touch-icon-60x60.png b/public/img/favicons/apple-touch-icon-60x60.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-60x60.png
rename to public/img/favicons/apple-touch-icon-60x60.png
diff --git a/web/public/img/favicons/apple-touch-icon-72x72.png b/public/img/favicons/apple-touch-icon-72x72.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-72x72.png
rename to public/img/favicons/apple-touch-icon-72x72.png
diff --git a/web/public/img/favicons/apple-touch-icon-76x76.png b/public/img/favicons/apple-touch-icon-76x76.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-76x76.png
rename to public/img/favicons/apple-touch-icon-76x76.png
diff --git a/web/public/img/favicons/apple-touch-icon-precomposed.png b/public/img/favicons/apple-touch-icon-precomposed.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon-precomposed.png
rename to public/img/favicons/apple-touch-icon-precomposed.png
diff --git a/web/public/img/favicons/apple-touch-icon.png b/public/img/favicons/apple-touch-icon.png
similarity index 100%
rename from web/public/img/favicons/apple-touch-icon.png
rename to public/img/favicons/apple-touch-icon.png
diff --git a/web/public/img/favicons/browserconfig.xml b/public/img/favicons/browserconfig.xml
similarity index 100%
rename from web/public/img/favicons/browserconfig.xml
rename to public/img/favicons/browserconfig.xml
diff --git a/web/public/img/favicons/favicon-160x160.png b/public/img/favicons/favicon-160x160.png
similarity index 100%
rename from web/public/img/favicons/favicon-160x160.png
rename to public/img/favicons/favicon-160x160.png
diff --git a/web/public/img/favicons/favicon-16x16.png b/public/img/favicons/favicon-16x16.png
similarity index 100%
rename from web/public/img/favicons/favicon-16x16.png
rename to public/img/favicons/favicon-16x16.png
diff --git a/web/public/img/favicons/favicon-196x196.png b/public/img/favicons/favicon-196x196.png
similarity index 100%
rename from web/public/img/favicons/favicon-196x196.png
rename to public/img/favicons/favicon-196x196.png
diff --git a/web/public/img/favicons/favicon-32x32.png b/public/img/favicons/favicon-32x32.png
similarity index 100%
rename from web/public/img/favicons/favicon-32x32.png
rename to public/img/favicons/favicon-32x32.png
diff --git a/web/public/img/favicons/favicon-96x96.png b/public/img/favicons/favicon-96x96.png
similarity index 100%
rename from web/public/img/favicons/favicon-96x96.png
rename to public/img/favicons/favicon-96x96.png
diff --git a/web/public/img/favicons/favicon.ico b/public/img/favicons/favicon.ico
similarity index 100%
rename from web/public/img/favicons/favicon.ico
rename to public/img/favicons/favicon.ico
diff --git a/web/public/img/favicons/mstile-144x144.png b/public/img/favicons/mstile-144x144.png
similarity index 100%
rename from web/public/img/favicons/mstile-144x144.png
rename to public/img/favicons/mstile-144x144.png
diff --git a/web/public/img/favicons/mstile-150x150.png b/public/img/favicons/mstile-150x150.png
similarity index 100%
rename from web/public/img/favicons/mstile-150x150.png
rename to public/img/favicons/mstile-150x150.png
diff --git a/web/public/img/favicons/mstile-310x150.png b/public/img/favicons/mstile-310x150.png
similarity index 100%
rename from web/public/img/favicons/mstile-310x150.png
rename to public/img/favicons/mstile-310x150.png
diff --git a/web/public/img/favicons/mstile-310x310.png b/public/img/favicons/mstile-310x310.png
similarity index 100%
rename from web/public/img/favicons/mstile-310x310.png
rename to public/img/favicons/mstile-310x310.png
diff --git a/web/public/img/favicons/mstile-70x70.png b/public/img/favicons/mstile-70x70.png
similarity index 100%
rename from web/public/img/favicons/mstile-70x70.png
rename to public/img/favicons/mstile-70x70.png
diff --git a/web/public/img/frontpage/bg1-blur.jpg b/public/img/frontpage/bg1-blur.jpg
similarity index 100%
rename from web/public/img/frontpage/bg1-blur.jpg
rename to public/img/frontpage/bg1-blur.jpg
diff --git a/web/public/img/frontpage/bg1.jpg b/public/img/frontpage/bg1.jpg
similarity index 100%
rename from web/public/img/frontpage/bg1.jpg
rename to public/img/frontpage/bg1.jpg
diff --git a/web/public/img/frontpage/bg2.jpg b/public/img/frontpage/bg2.jpg
similarity index 100%
rename from web/public/img/frontpage/bg2.jpg
rename to public/img/frontpage/bg2.jpg
diff --git a/web/public/img/frontpage/bg3.jpg b/public/img/frontpage/bg3.jpg
similarity index 100%
rename from web/public/img/frontpage/bg3.jpg
rename to public/img/frontpage/bg3.jpg
diff --git a/web/public/img/frontpage/bg4.jpg b/public/img/frontpage/bg4.jpg
similarity index 100%
rename from web/public/img/frontpage/bg4.jpg
rename to public/img/frontpage/bg4.jpg
diff --git a/web/public/img/frontpage/bg5.jpg b/public/img/frontpage/bg5.jpg
similarity index 100%
rename from web/public/img/frontpage/bg5.jpg
rename to public/img/frontpage/bg5.jpg
diff --git a/web/public/img/frontpage/bg6.jpg b/public/img/frontpage/bg6.jpg
similarity index 100%
rename from web/public/img/frontpage/bg6.jpg
rename to public/img/frontpage/bg6.jpg
diff --git a/web/public/img/frontpage/icon-arrowdown.svg b/public/img/frontpage/icon-arrowdown.svg
similarity index 100%
rename from web/public/img/frontpage/icon-arrowdown.svg
rename to public/img/frontpage/icon-arrowdown.svg
diff --git a/web/public/img/frontpage/icon-check.svg b/public/img/frontpage/icon-check.svg
similarity index 100%
rename from web/public/img/frontpage/icon-check.svg
rename to public/img/frontpage/icon-check.svg
diff --git a/web/public/img/frontpage/icon-locate.svg b/public/img/frontpage/icon-locate.svg
similarity index 100%
rename from web/public/img/frontpage/icon-locate.svg
rename to public/img/frontpage/icon-locate.svg
diff --git a/web/public/img/frontpage/icon-opensoure.svg b/public/img/frontpage/icon-opensoure.svg
similarity index 100%
rename from web/public/img/frontpage/icon-opensoure.svg
rename to public/img/frontpage/icon-opensoure.svg
diff --git a/web/public/img/frontpage/icon-playbutton.svg b/public/img/frontpage/icon-playbutton.svg
similarity index 100%
rename from web/public/img/frontpage/icon-playbutton.svg
rename to public/img/frontpage/icon-playbutton.svg
diff --git a/web/public/img/frontpage/icon-video.svg b/public/img/frontpage/icon-video.svg
similarity index 100%
rename from web/public/img/frontpage/icon-video.svg
rename to public/img/frontpage/icon-video.svg
diff --git a/web/public/img/frontpage/influencers-1.png b/public/img/frontpage/influencers-1.png
similarity index 100%
rename from web/public/img/frontpage/influencers-1.png
rename to public/img/frontpage/influencers-1.png
diff --git a/web/public/img/frontpage/influencers-2.png b/public/img/frontpage/influencers-2.png
similarity index 100%
rename from web/public/img/frontpage/influencers-2.png
rename to public/img/frontpage/influencers-2.png
diff --git a/web/public/img/frontpage/influencers-3.png b/public/img/frontpage/influencers-3.png
similarity index 100%
rename from web/public/img/frontpage/influencers-3.png
rename to public/img/frontpage/influencers-3.png
diff --git a/web/public/img/frontpage/influencers-4.png b/public/img/frontpage/influencers-4.png
similarity index 100%
rename from web/public/img/frontpage/influencers-4.png
rename to public/img/frontpage/influencers-4.png
diff --git a/web/public/img/frontpage/login-facebook.svg b/public/img/frontpage/login-facebook.svg
similarity index 100%
rename from web/public/img/frontpage/login-facebook.svg
rename to public/img/frontpage/login-facebook.svg
diff --git a/web/public/img/frontpage/login-github.svg b/public/img/frontpage/login-github.svg
similarity index 100%
rename from web/public/img/frontpage/login-github.svg
rename to public/img/frontpage/login-github.svg
diff --git a/web/public/img/frontpage/login-linkedin.svg b/public/img/frontpage/login-linkedin.svg
similarity index 100%
rename from web/public/img/frontpage/login-linkedin.svg
rename to public/img/frontpage/login-linkedin.svg
diff --git a/web/public/img/frontpage/login-stackoverflow.svg b/public/img/frontpage/login-stackoverflow.svg
similarity index 100%
rename from web/public/img/frontpage/login-stackoverflow.svg
rename to public/img/frontpage/login-stackoverflow.svg
diff --git a/web/public/img/frontpage/login-twitter.svg b/public/img/frontpage/login-twitter.svg
similarity index 100%
rename from web/public/img/frontpage/login-twitter.svg
rename to public/img/frontpage/login-twitter.svg
diff --git a/web/public/img/frontpage/logo-inversed.svg b/public/img/frontpage/logo-inversed.svg
similarity index 100%
rename from web/public/img/frontpage/logo-inversed.svg
rename to public/img/frontpage/logo-inversed.svg
diff --git a/web/public/img/frontpage/logo.svg b/public/img/frontpage/logo.svg
similarity index 100%
rename from web/public/img/frontpage/logo.svg
rename to public/img/frontpage/logo.svg
diff --git a/web/public/img/frontpage/tools-1.svg b/public/img/frontpage/tools-1.svg
similarity index 100%
rename from web/public/img/frontpage/tools-1.svg
rename to public/img/frontpage/tools-1.svg
diff --git a/web/public/img/frontpage/tools-10.svg b/public/img/frontpage/tools-10.svg
similarity index 100%
rename from web/public/img/frontpage/tools-10.svg
rename to public/img/frontpage/tools-10.svg
diff --git a/web/public/img/frontpage/tools-2.svg b/public/img/frontpage/tools-2.svg
similarity index 100%
rename from web/public/img/frontpage/tools-2.svg
rename to public/img/frontpage/tools-2.svg
diff --git a/web/public/img/frontpage/tools-3.svg b/public/img/frontpage/tools-3.svg
similarity index 100%
rename from web/public/img/frontpage/tools-3.svg
rename to public/img/frontpage/tools-3.svg
diff --git a/web/public/img/frontpage/tools-4.svg b/public/img/frontpage/tools-4.svg
similarity index 100%
rename from web/public/img/frontpage/tools-4.svg
rename to public/img/frontpage/tools-4.svg
diff --git a/web/public/img/frontpage/tools-5.svg b/public/img/frontpage/tools-5.svg
similarity index 100%
rename from web/public/img/frontpage/tools-5.svg
rename to public/img/frontpage/tools-5.svg
diff --git a/web/public/img/frontpage/tools-6.svg b/public/img/frontpage/tools-6.svg
similarity index 100%
rename from web/public/img/frontpage/tools-6.svg
rename to public/img/frontpage/tools-6.svg
diff --git a/web/public/img/frontpage/tools-7.svg b/public/img/frontpage/tools-7.svg
similarity index 100%
rename from web/public/img/frontpage/tools-7.svg
rename to public/img/frontpage/tools-7.svg
diff --git a/web/public/img/frontpage/tools-8.svg b/public/img/frontpage/tools-8.svg
similarity index 100%
rename from web/public/img/frontpage/tools-8.svg
rename to public/img/frontpage/tools-8.svg
diff --git a/web/public/img/frontpage/tools-9.svg b/public/img/frontpage/tools-9.svg
similarity index 100%
rename from web/public/img/frontpage/tools-9.svg
rename to public/img/frontpage/tools-9.svg
diff --git a/web/public/img/frontpage/video-pause.svg b/public/img/frontpage/video-pause.svg
similarity index 100%
rename from web/public/img/frontpage/video-pause.svg
rename to public/img/frontpage/video-pause.svg
diff --git a/web/public/img/gloves.jpg b/public/img/gloves.jpg
similarity index 100%
rename from web/public/img/gloves.jpg
rename to public/img/gloves.jpg
diff --git a/web/public/img/good-stuff/4k-is-for-programmers.jpg b/public/img/good-stuff/4k-is-for-programmers.jpg
similarity index 100%
rename from web/public/img/good-stuff/4k-is-for-programmers.jpg
rename to public/img/good-stuff/4k-is-for-programmers.jpg
diff --git a/web/public/img/good-stuff/amazon-drone.jpg b/public/img/good-stuff/amazon-drone.jpg
similarity index 100%
rename from web/public/img/good-stuff/amazon-drone.jpg
rename to public/img/good-stuff/amazon-drone.jpg
diff --git a/web/public/img/good-stuff/dell-4K.jpg b/public/img/good-stuff/dell-4K.jpg
similarity index 100%
rename from web/public/img/good-stuff/dell-4K.jpg
rename to public/img/good-stuff/dell-4K.jpg
diff --git a/web/public/img/good-stuff/rasbery-pi.jpg b/public/img/good-stuff/rasbery-pi.jpg
similarity index 100%
rename from web/public/img/good-stuff/rasbery-pi.jpg
rename to public/img/good-stuff/rasbery-pi.jpg
diff --git a/web/public/img/good-stuff/seth-godin.jpg b/public/img/good-stuff/seth-godin.jpg
similarity index 100%
rename from web/public/img/good-stuff/seth-godin.jpg
rename to public/img/good-stuff/seth-godin.jpg
diff --git a/web/public/img/good-stuff/slim-fold.jpg b/public/img/good-stuff/slim-fold.jpg
similarity index 100%
rename from web/public/img/good-stuff/slim-fold.jpg
rename to public/img/good-stuff/slim-fold.jpg
diff --git a/web/public/img/good-stuff/spark-core.jpg b/public/img/good-stuff/spark-core.jpg
similarity index 100%
rename from web/public/img/good-stuff/spark-core.jpg
rename to public/img/good-stuff/spark-core.jpg
diff --git a/web/public/img/good-stuff/tim-ferris.png b/public/img/good-stuff/tim-ferris.png
similarity index 100%
rename from web/public/img/good-stuff/tim-ferris.png
rename to public/img/good-stuff/tim-ferris.png
diff --git a/web/public/img/hackernews.png b/public/img/hackernews.png
similarity index 100%
rename from web/public/img/hackernews.png
rename to public/img/hackernews.png
diff --git a/web/public/img/hackers-welcome.png b/public/img/hackers-welcome.png
similarity index 100%
rename from web/public/img/hackers-welcome.png
rename to public/img/hackers-welcome.png
diff --git a/web/public/img/help.png b/public/img/help.png
similarity index 100%
rename from web/public/img/help.png
rename to public/img/help.png
diff --git a/web/public/img/help.svg b/public/img/help.svg
similarity index 100%
rename from web/public/img/help.svg
rename to public/img/help.svg
diff --git a/web/public/img/highlights/4K-screen.jpg b/public/img/highlights/4K-screen.jpg
similarity index 100%
rename from web/public/img/highlights/4K-screen.jpg
rename to public/img/highlights/4K-screen.jpg
diff --git a/web/public/img/highlights/app-dernier-metro.jpg b/public/img/highlights/app-dernier-metro.jpg
similarity index 100%
rename from web/public/img/highlights/app-dernier-metro.jpg
rename to public/img/highlights/app-dernier-metro.jpg
diff --git a/web/public/img/highlights/arduino.jpg b/public/img/highlights/arduino.jpg
similarity index 100%
rename from web/public/img/highlights/arduino.jpg
rename to public/img/highlights/arduino.jpg
diff --git a/web/public/img/highlights/blendWebMix.jpg b/public/img/highlights/blendWebMix.jpg
similarity index 100%
rename from web/public/img/highlights/blendWebMix.jpg
rename to public/img/highlights/blendWebMix.jpg
diff --git a/web/public/img/highlights/startupweekend-geneve.jpg b/public/img/highlights/startupweekend-geneve.jpg
similarity index 100%
rename from web/public/img/highlights/startupweekend-geneve.jpg
rename to public/img/highlights/startupweekend-geneve.jpg
diff --git a/web/public/img/icon-arrow-down.svg b/public/img/icon-arrow-down.svg
similarity index 100%
rename from web/public/img/icon-arrow-down.svg
rename to public/img/icon-arrow-down.svg
diff --git a/web/public/img/icon-arrow-left.svg b/public/img/icon-arrow-left.svg
similarity index 100%
rename from web/public/img/icon-arrow-left.svg
rename to public/img/icon-arrow-left.svg
diff --git a/web/public/img/icon-arrow-right.svg b/public/img/icon-arrow-right.svg
similarity index 100%
rename from web/public/img/icon-arrow-right.svg
rename to public/img/icon-arrow-right.svg
diff --git a/web/public/img/icon-arrow-up.svg b/public/img/icon-arrow-up.svg
similarity index 100%
rename from web/public/img/icon-arrow-up.svg
rename to public/img/icon-arrow-up.svg
diff --git a/web/public/img/icon-article.svg b/public/img/icon-article.svg
similarity index 100%
rename from web/public/img/icon-article.svg
rename to public/img/icon-article.svg
diff --git a/web/public/img/icon-ask.svg b/public/img/icon-ask.svg
similarity index 100%
rename from web/public/img/icon-ask.svg
rename to public/img/icon-ask.svg
diff --git a/web/public/img/icon-audio.svg b/public/img/icon-audio.svg
similarity index 100%
rename from web/public/img/icon-audio.svg
rename to public/img/icon-audio.svg
diff --git a/web/public/img/icon-book.svg b/public/img/icon-book.svg
similarity index 100%
rename from web/public/img/icon-book.svg
rename to public/img/icon-book.svg
diff --git a/web/public/img/icon-close-circled.svg b/public/img/icon-close-circled.svg
similarity index 100%
rename from web/public/img/icon-close-circled.svg
rename to public/img/icon-close-circled.svg
diff --git a/web/public/img/icon-close-round.svg b/public/img/icon-close-round.svg
similarity index 100%
rename from web/public/img/icon-close-round.svg
rename to public/img/icon-close-round.svg
diff --git a/web/public/img/icon-close.svg b/public/img/icon-close.svg
similarity index 100%
rename from web/public/img/icon-close.svg
rename to public/img/icon-close.svg
diff --git a/web/public/img/icon-event.svg b/public/img/icon-event.svg
similarity index 100%
rename from web/public/img/icon-event.svg
rename to public/img/icon-event.svg
diff --git a/web/public/img/icon-hack.svg b/public/img/icon-hack.svg
similarity index 100%
rename from web/public/img/icon-hack.svg
rename to public/img/icon-hack.svg
diff --git a/web/public/img/icon-ios7-checkmark-empty.svg b/public/img/icon-ios7-checkmark-empty.svg
similarity index 100%
rename from web/public/img/icon-ios7-checkmark-empty.svg
rename to public/img/icon-ios7-checkmark-empty.svg
diff --git a/web/public/img/icon-ios7-checkmark-outline.svg b/public/img/icon-ios7-checkmark-outline.svg
similarity index 100%
rename from web/public/img/icon-ios7-checkmark-outline.svg
rename to public/img/icon-ios7-checkmark-outline.svg
diff --git a/web/public/img/icon-ios7-checkmark.svg b/public/img/icon-ios7-checkmark.svg
similarity index 100%
rename from web/public/img/icon-ios7-checkmark.svg
rename to public/img/icon-ios7-checkmark.svg
diff --git a/web/public/img/icon-other.svg b/public/img/icon-other.svg
similarity index 100%
rename from web/public/img/icon-other.svg
rename to public/img/icon-other.svg
diff --git a/web/public/img/icon-picture-png.png b/public/img/icon-picture-png.png
similarity index 100%
rename from web/public/img/icon-picture-png.png
rename to public/img/icon-picture-png.png
diff --git a/web/public/img/icon-picture.svg b/public/img/icon-picture.svg
similarity index 100%
rename from web/public/img/icon-picture.svg
rename to public/img/icon-picture.svg
diff --git a/web/public/img/icon-product.svg b/public/img/icon-product.svg
similarity index 100%
rename from web/public/img/icon-product.svg
rename to public/img/icon-product.svg
diff --git a/web/public/img/icon-show.svg b/public/img/icon-show.svg
similarity index 100%
rename from web/public/img/icon-show.svg
rename to public/img/icon-show.svg
diff --git a/web/public/img/icon-video.svg b/public/img/icon-video.svg
similarity index 100%
rename from web/public/img/icon-video.svg
rename to public/img/icon-video.svg
diff --git a/web/public/img/icon-work.svg b/public/img/icon-work.svg
similarity index 100%
rename from web/public/img/icon-work.svg
rename to public/img/icon-work.svg
diff --git a/web/public/img/icon.ai b/public/img/icon.ai
similarity index 100%
rename from web/public/img/icon.ai
rename to public/img/icon.ai
diff --git a/web/public/img/invited.svg b/public/img/invited.svg
similarity index 100%
rename from web/public/img/invited.svg
rename to public/img/invited.svg
diff --git a/web/public/img/join-us.svg b/public/img/join-us.svg
similarity index 100%
rename from web/public/img/join-us.svg
rename to public/img/join-us.svg
diff --git a/web/public/img/logo-inversed.svg b/public/img/logo-inversed.svg
similarity index 100%
rename from web/public/img/logo-inversed.svg
rename to public/img/logo-inversed.svg
diff --git a/web/public/img/logo.svg b/public/img/logo.svg
similarity index 100%
rename from web/public/img/logo.svg
rename to public/img/logo.svg
diff --git a/web/public/img/markers/coworking.png b/public/img/markers/coworking.png
similarity index 100%
rename from web/public/img/markers/coworking.png
rename to public/img/markers/coworking.png
diff --git a/web/public/img/markers/fablab.png b/public/img/markers/fablab.png
similarity index 100%
rename from web/public/img/markers/fablab.png
rename to public/img/markers/fablab.png
diff --git a/web/public/img/markers/hackerspace.png b/public/img/markers/hackerspace.png
similarity index 100%
rename from web/public/img/markers/hackerspace.png
rename to public/img/markers/hackerspace.png
diff --git a/web/public/img/markers/incubator.png b/public/img/markers/incubator.png
similarity index 100%
rename from web/public/img/markers/incubator.png
rename to public/img/markers/incubator.png
diff --git a/web/public/img/markers/meetup.png b/public/img/markers/meetup.png
similarity index 100%
rename from web/public/img/markers/meetup.png
rename to public/img/markers/meetup.png
diff --git a/web/public/img/markers/other.png b/public/img/markers/other.png
similarity index 100%
rename from web/public/img/markers/other.png
rename to public/img/markers/other.png
diff --git a/web/public/img/markers/point.png b/public/img/markers/point.png
similarity index 100%
rename from web/public/img/markers/point.png
rename to public/img/markers/point.png
diff --git a/web/public/img/markers/wifi-cafe.png b/public/img/markers/wifi-cafe.png
similarity index 100%
rename from web/public/img/markers/wifi-cafe.png
rename to public/img/markers/wifi-cafe.png
diff --git a/web/public/img/profile-unknown.svg b/public/img/profile-unknown.svg
similarity index 100%
rename from web/public/img/profile-unknown.svg
rename to public/img/profile-unknown.svg
diff --git a/web/public/img/social-logo-01.svg b/public/img/social-logo-01.svg
similarity index 100%
rename from web/public/img/social-logo-01.svg
rename to public/img/social-logo-01.svg
diff --git a/web/public/img/social-logo-02.svg b/public/img/social-logo-02.svg
similarity index 100%
rename from web/public/img/social-logo-02.svg
rename to public/img/social-logo-02.svg
diff --git a/web/public/img/social-logo-03.svg b/public/img/social-logo-03.svg
similarity index 100%
rename from web/public/img/social-logo-03.svg
rename to public/img/social-logo-03.svg
diff --git a/web/public/img/social-logo-04.svg b/public/img/social-logo-04.svg
similarity index 100%
rename from web/public/img/social-logo-04.svg
rename to public/img/social-logo-04.svg
diff --git a/web/public/img/social-logo-05.svg b/public/img/social-logo-05.svg
similarity index 100%
rename from web/public/img/social-logo-05.svg
rename to public/img/social-logo-05.svg
diff --git a/web/public/img/social-logo-facebook.svg b/public/img/social-logo-facebook.svg
similarity index 100%
rename from web/public/img/social-logo-facebook.svg
rename to public/img/social-logo-facebook.svg
diff --git a/web/public/img/social-logo-github.svg b/public/img/social-logo-github.svg
similarity index 100%
rename from web/public/img/social-logo-github.svg
rename to public/img/social-logo-github.svg
diff --git a/web/public/img/social-logo-twitter.svg b/public/img/social-logo-twitter.svg
similarity index 100%
rename from web/public/img/social-logo-twitter.svg
rename to public/img/social-logo-twitter.svg
diff --git a/web/public/img/spacer.gif b/public/img/spacer.gif
similarity index 100%
rename from web/public/img/spacer.gif
rename to public/img/spacer.gif
diff --git a/web/server/Methods.js b/server/Methods.js
similarity index 100%
rename from web/server/Methods.js
rename to server/Methods.js
diff --git a/web/server/Router.js b/server/Router.js
similarity index 94%
rename from web/server/Router.js
rename to server/Router.js
index 366fb85..b8e895e 100644
--- a/web/server/Router.js
+++ b/server/Router.js
@@ -8,9 +8,9 @@ Router.route('/mandrill-webhook', function() {
   var events = EJSON.parse(Object.property(this.request.body, 'mandrill_events') || "[]");
 
   var addEvent = function(event) {
-    // event format: http://help.mandrill.com/entries/24466132-Webhook-Format 
-    
-    if (!event.event) 
+    // event format: http://help.mandrill.com/entries/24466132-Webhook-Format
+
+    if (!event.event)
       return; /* not a message event */
 
     console.log('Email webhook event:', event.event);
@@ -22,7 +22,7 @@ Router.route('/mandrill-webhook', function() {
       client: event.user_agent_parsed.ua_family,
       version: event.user_agent_parsed.ua_version,
     };
-    
+
     // link event to original message
     EmailsOutbound.update({'to.messageId': messageId}, {
       $push: { 'to.$.events': {
@@ -49,26 +49,26 @@ Router.route('/mandrill-webhook', function() {
 
 
 Router.route('/:catchAll?', function () {
-    var url = getRequestUrl(this.request); 
+    var url = getRequestUrl(this.request);
     var city = Url.city(url);
     var isLocalhost = Url.isLocalhost(url);
-    
+
     // check if there is a valid city present in the url
     if (!city || !City.lookup(city)) {
 
       // this subdomain doesn't exist or isn't a valid city
-      
+
       // we try to find the closest city
       var userIp = getClientIp(this.request);
       var location = Geo.requestLocationForIp(userIp);
-      var closestCity = Geo.findClosestCity(location);    
-      
+      var closestCity = Geo.findClosestCity(location);
+
       if (closestCity) {
 
         // if closest city is found we redirect the user to a new url
         var cityUrl = Url.replaceCity(closestCity, url);
         return redirect(cityUrl, this.response);
-        
+
       } else if (city !== 'www') {
 
         // If closest city can't be found, we redirect to www.
@@ -77,7 +77,7 @@ Router.route('/:catchAll?', function () {
         return redirect(cityUrl, this.response);
       }
     }
-    
+
     // done!
     this.next();
 
diff --git a/web/server/Server.js b/server/Server.js
similarity index 89%
rename from web/server/Server.js
rename to server/Server.js
index 792c3c2..1d56d9a 100644
--- a/web/server/Server.js
+++ b/server/Server.js
@@ -2,13 +2,13 @@
 
 // server startup
 Meteor.startup(function() {
-  
+
   /* server startup */
 
   // add environment variables from settings file to current process environment
   if (Settings.env)
     _.extend(process.env, Settings.env);
-  
+
   // print uptime to console
   uptimeLogging();
 
@@ -16,9 +16,9 @@ Meteor.startup(function() {
   // taken into account that the Heroku server
   // is restarted once every day
   Meteor.setTimeout(runAfterStartupDelayed, 1000 * 60 * 15);
-  
-  // info about development mode
-  if (Settings['environment'] === 'dev')
+
+  // info about local mode
+  if (Settings['environment'] === 'local')
     console.info("Mailservers aren't configured in development mode. You can ignore the warnings.")
 });
 
@@ -38,8 +38,8 @@ var runAfterStartupDelayed = function() {
 // show server uptime in console
 var uptimeLogging = function() {
   var startupDate = new Date();
-  var logging = function() { 
-    console.log("[Server Uptime]: " + moment(startupDate).fromNow(true)); 
+  var logging = function() {
+    console.log("[Server Uptime]: " + moment(startupDate).fromNow(true));
   }
   Meteor.setInterval(logging, 15 * 60 * 1000);
 }
diff --git a/web/server/Subscriptions.js b/server/Subscriptions.js
similarity index 99%
rename from web/server/Subscriptions.js
rename to server/Subscriptions.js
index 72a5568..0f447ea 100644
--- a/web/server/Subscriptions.js
+++ b/server/Subscriptions.js
@@ -63,8 +63,3 @@ Meteor.publish('inviteBroadcastUser', function(inviteBitHash) {
   var fields = Query.fieldsArray(_.union(userFields, ['invitationPhrase']));
   return !invitePhrase ? [] : Users.find({invitationPhrase: invitePhrase}, {fields: fields, limit: 1});
 });
-
-
-
-
-
diff --git a/settings/dev.json b/settings/local.json
similarity index 93%
rename from settings/dev.json
rename to settings/local.json
index 5c8fd68..7e79ec3 100644
--- a/settings/dev.json
+++ b/settings/local.json
@@ -1,12 +1,12 @@
 {
   "public": {
-    "environment": "dev",
+    "environment": "local",
     "simpleSchemeDebug": true,
-   
+
     "mapbox": {
       "token": "pk.eyJ1IjoiamFybm9sZWNvbnRlIiwiYSI6IjBXVXA5ZkEifQ.m_acUUqFwgzdmeRpX2lgUQ"
     },
-    
+
     "facebook": {
       "appId": "1529025657336189"
     },
@@ -15,7 +15,7 @@
     },
     "twitter": {
       "consumerKey": "JKgQ2DhqaJ1a0w6MM2FjtgVCX"
-    }   
+    }
   },
 
   "facebook": {
diff --git a/tools/install.sh b/tools/install.sh
index fa0a7c1..c51602d 100644
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -40,7 +40,9 @@ if ! command -v meteor > /dev/null ; then
 fi
 
 # Install hckrs executable
+echo ""
 echo "Install hckrs..."
+echo ""
 
 # Add executable to $PATH
 EXPORT="export PATH=$PATH:$HOME/.hckrs"
@@ -63,8 +65,7 @@ chmod +x $HOME/.hckrs/hckrs
 # Start hckrs
 echo "hckrs.io development bundle successfully installed!"
 echo ""
-echo "Now move to the project folder:"
-echo "    cd web"
-echo "And start up a local server:"
+echo "Start up a local server by entering:"
+echo ""
 echo "    hckrs run"
 echo ""
\ No newline at end of file
diff --git a/tools/main.sh b/tools/main.sh
index f32c503..100fe6d 100644
--- a/tools/main.sh
+++ b/tools/main.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd ".." && pwd )"
 TOOLS="$ROOT/tools"
-WEB="$ROOT/web"
+WEB="$ROOT"
 
 
 # Require to be in a project directory
@@ -9,9 +9,6 @@ function require_project_directory {
   if [ ! $(pwd) = $WEB ]; then
     echo "You are not in a Meteor project directory."
     echo ""
-    echo "Move to a project:"
-    echo "    cd web"
-    echo ""
     exit 1
   fi
 }
@@ -20,7 +17,7 @@ function require_project_directory {
 function wait_for_meteor {
   while ! hckrs alive; do
     echo "wait for meteor"
-    sleep 2 
+    sleep 2
   done
   echo "meteor alive!"
 }
@@ -34,7 +31,7 @@ function is_meteor_running {
 function run {
   IP="$( ifconfig | sed -En 's/127.0.0.1//;s/.*inet (addr:|adr:)?(([0-9]*\.){3}[0-9]*).*/\2/p' )"
   URL=http://$IP.xip.io:3000
-  SETTINGS=$ROOT/settings/dev.json
+  SETTINGS=$ROOT/settings/local.json
 
   export ROOT_URL=$URL
   meteor run --settings $SETTINGS
@@ -45,28 +42,28 @@ function run {
 # MAIN CLI
 
 if [ "$1" = "" ] || [ "$1" = "run" ]; then
-  
-  # Start local development server
+
+  # Start up local server
   require_project_directory
   run
 
 elif [ "$1" = "hello" ]; then
- 
+
   # Echo
   echo "Hi!"
 
 elif [ "$1" = "alive" ]; then
- 
+
   # Verify if meteor is alive
   is_meteor_running
 
 elif [ "$1" = "wait" ]; then
-  
+
   # Wait for meteor to be alive
   wait_for_meteor
-  
+
 elif [ "$1" = "reset" ]; then
-  
+
   # Reset project/database
   require_project_directory
   meteor reset
@@ -76,7 +73,7 @@ elif [ "$1" = "reset" ]; then
 elif [ "$1" = "admin" ]; then
 
   if [ "$2" = "backup" ]; then
-    bash "$TOOLS/#private-backup-$3.sh"    
+    bash "$TOOLS/#private-backup-$3.sh"
   elif [ "$2" = "clone" ]; then
     bash "$TOOLS/#private-clone-$3-to-$4.sh"
   fi