diff --git a/viDoc/config/assets/default.js b/viDoc/config/assets/default.js
index 875cdf4..372d0bc 100644
--- a/viDoc/config/assets/default.js
+++ b/viDoc/config/assets/default.js
@@ -27,7 +27,7 @@ module.exports = {
         'public/lib/AdminLTE/plugins/slimScroll/jquery.slimscroll.min.js',
         'public/lib/AdminLTE/plugins/iCheck/icheck.min.js',
         'public/lib/AdminLTE/dist/js/app.min.js',
-          'public/lib/angular/angular.js',
+        'public/lib/angular/angular.js',
         'public/lib/ckeditor/ckeditor.js',
         'public/lib/angular-animate/angular-animate.js',
         'public/lib/AdminLTE/bootstrap/js/bootstrap.min.js',
diff --git a/viDoc/modules/articles/client/config/articles.client.routes.js b/viDoc/modules/articles/client/config/articles.client.routes.js
index 0a7e272..5e67965 100644
--- a/viDoc/modules/articles/client/config/articles.client.routes.js
+++ b/viDoc/modules/articles/client/config/articles.client.routes.js
@@ -12,18 +12,41 @@
     $stateProvider
       .state('articles', {
         abstract: true,
-        url: '/projects/:projectId/folders/:folderName/articles',
+        url: '/projects/:projectId/folders/:folderId/articles',
         template: '<ui-view/>'
       })
-      .state('articles.list', {
-        url: '',
-        templateUrl: '/modules/articles/client/views/list-articles.client.view.html',
-        controller: 'ArticlesListController',
+      .state('articles.create', {
+        url: '/create',
+        templateUrl: '/modules/articles/client/views/admin/create-articles.client.view.html',
+        controller: 'CreateArticlesAdminController',
+        controllerAs: 'vm',
+        data: {
+          roles: ['user', 'admin'],
+          pageTitle: 'New Articles'
+        },
+        resolve: {
+          articleResolve: newArticleFolder
+        }
+      })
+      .state('articles.edit', {
+        url: '/:articleId',
+        templateUrl: '/modules/articles/client/views/admin/edit-articles.client.view.html',
+        controller: 'EditArticlesAdminController',
         controllerAs: 'vm',
         data: {
-          pageTitle: 'Articles List'
+          roles: ['user', 'admin'],
+          pageTitle: '{{articleResolve.title}}'
+        },
+        resolve: {
+          articleResolve: getArticleFolder
         }
-      }).state('articles.create', {
+      })
+      .state('article', {
+        abstract: true,
+        url: '/projects/:projectId/articles',
+        template: '<ui-view/>'
+      })
+      .state('article.create', {
         url: '/create',
         templateUrl: '/modules/articles/client/views/admin/create-articles.client.view.html',
         controller: 'CreateArticlesAdminController',
@@ -33,10 +56,10 @@
           pageTitle: 'New Articles'
         },
         resolve: {
-          articleResolve: newArticle
+          articleResolve: newArticleProject
         }
       })
-      .state('articles.edit', {
+      .state('article.edit', {
         url: '/:articleId',
         templateUrl: '/modules/articles/client/views/admin/edit-articles.client.view.html',
         controller: 'EditArticlesAdminController',
@@ -46,23 +69,39 @@
           pageTitle: '{{articleResolve.title}}'
         },
         resolve: {
-          articleResolve: getArticle
+          articleResolve: getArticleProject
         }
       });
   }
 
-  getArticle.$inject = ['$stateParams', 'ArticlesService'];
+  getArticleFolder.$inject = ['$stateParams', 'ArticlesService'];
 
-  function getArticle($stateParams, ArticlesService) {
+  function getArticleFolder($stateParams, ArticlesService) {
     return ArticlesService.get({
-      folderId: $stateParams.folderName,
+      projectId: $stateParams.projectId,
+      folderId: $stateParams.folderId,
       articleId: $stateParams.articleId
     }).$promise;
   }
 
-  newArticle.$inject = ['ArticlesService'];
+  newArticleFolder.$inject = ['ArticlesService'];
 
-  function newArticle(ArticlesService) {
+  function newArticleFolder(ArticlesService) {
     return new ArticlesService();
   }
+
+  getArticleProject.$inject = ['$stateParams', 'ArticlesServiceProject'];
+
+  function getArticleProject($stateParams, ArticlesServiceProject) {
+    return ArticlesServiceProject.get({
+      projectId: $stateParams.projectId,
+      articleId: $stateParams.articleId
+    }).$promise;
+  }
+
+  newArticleProject.$inject = ['ArticlesServiceProject'];
+
+  function newArticleProject(ArticlesServiceProject) {
+    return new ArticlesServiceProject();
+  }
 }());
diff --git a/viDoc/modules/articles/client/controllers/admin/create-articles.client.controller.js b/viDoc/modules/articles/client/controllers/admin/create-articles.client.controller.js
index eafc473..931aa14 100644
--- a/viDoc/modules/articles/client/controllers/admin/create-articles.client.controller.js
+++ b/viDoc/modules/articles/client/controllers/admin/create-articles.client.controller.js
@@ -39,10 +39,16 @@
     // Remove existing Article
     function close() {
       vm.content.destroy();
-      $state.go('folders.view', {
-        projectId: $state.params.projectId,
-        folderName: $state.params.folderName
-      });
+      if ($state.params.folderId) {
+        $state.go('folders.view', {
+          projectId: $state.params.projectId,
+          folderId: $state.params.folderId
+        });
+      } else {
+        $state.go('projects.view', {
+          projectId: $state.params.projectId
+        });
+      }
     }
 
     // Save Article
@@ -53,15 +59,23 @@
       }
 
       vm.article.content = vm.content.getData();
-      vm.article.folder = $state.params.folderName;
+      vm.article.project = $state.params.projectId;
+      vm.article.folder = $state.params.folderId;
       vm.article.createOrUpdate()
         .then(successCallback)
         .catch(errorCallback);
 
       function successCallback(res) {
-        $state.go('projects.view', {
-          projectId: $state.params.projectId
-        });
+        if ($state.params.folderId) {
+          $state.go('folders.view', {
+            projectId: $state.params.projectId,
+            folderId: $state.params.folderId
+          });
+        } else {
+          $state.go('projects.view', {
+            projectId: $state.params.projectId,
+          });
+        }
         // should we send the User to the list or the updated Article's view?
         Notification.success({ message: '<i class="glyphicon glyphicon-ok"></i> Article saved successfully!' });
       }
diff --git a/viDoc/modules/articles/client/controllers/admin/edit-articles.client.controller.js b/viDoc/modules/articles/client/controllers/admin/edit-articles.client.controller.js
index 8ac2fd6..a525ad3 100644
--- a/viDoc/modules/articles/client/controllers/admin/edit-articles.client.controller.js
+++ b/viDoc/modules/articles/client/controllers/admin/edit-articles.client.controller.js
@@ -16,8 +16,7 @@
     vm.article = article;
     vm.authentication = Authentication;
     vm.projectId = $state.params.projectId;
-    vm.folderNameUrl = $state.params.folderName;
-    vm.folderNameNav = $state.params.folderName.replace(/-/gi, ' ');
+    vm.folderId = $state.params.folderId;
     vm.form = {};
     vm.remove = remove;
     vm.save = save;
@@ -68,10 +67,16 @@
     function remove() {
       if ($window.confirm('Are you sure you want to delete?')) {
         vm.article.$remove(function() {
-          $state.go('folders.view', {
-            projectId: vm.projectId,
-            folderName: vm.folderNameUrl
-          });
+          if (vm.folderId) {
+            $state.go('folders.view', {
+              projectId: vm.projectId,
+              folderId: vm.folderId
+            });
+          } else {
+            $state.go('projects.view', {
+              projectId: vm.projectId
+            });
+          }
           Notification.success({ message: '<i class="glyphicon glyphicon-ok"></i> Article deleted successfully!' });
         });
       }
@@ -88,10 +93,16 @@
 
       function successCallback(res) {
         vm.x.destroy();
-        $state.go('folders.view', {
-          projectId: vm.projectId,
-          folderName: vm.folderNameUrl
-        });
+        if (vm.folderId) {
+          $state.go('folders.view', {
+            projectId: vm.projectId,
+            folderId: vm.folderId
+          });
+        } else {
+          $state.go('projects.view', {
+            projectId: vm.projectId
+          });
+        }
         // should we send the User to the list or the updated Article's view?
         Notification.success({ message: '<i class="glyphicon glyphicon-ok"></i> Article saved successfully!' });
       }
diff --git a/viDoc/modules/articles/client/services/articles-project.client.service.js b/viDoc/modules/articles/client/services/articles-project.client.service.js
new file mode 100644
index 0000000..eccaf0e
--- /dev/null
+++ b/viDoc/modules/articles/client/services/articles-project.client.service.js
@@ -0,0 +1,54 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('articles.services')
+    .factory('ArticlesServiceProject', ArticlesServiceProject);
+
+  ArticlesServiceProject.$inject = ['$resource', '$log'];
+
+  function ArticlesServiceProject($resource, $log) {
+    var Article = $resource('/api/projects/:projectId/articles/:articleId', {
+      projectId: '@project',
+      articleId: '@_id'
+    }, {
+      update: {
+        method: 'PUT'
+      }
+    });
+
+    angular.extend(Article.prototype, {
+      createOrUpdate: function () {
+        var article = this;
+        return createOrUpdate(article);
+      }
+    });
+
+    return Article;
+
+    function createOrUpdate(article) {
+      if (article._id) {
+        return article.$update(onSuccess, onError);
+      } else {
+        return article.$save(onSuccess, onError);
+      }
+
+      // Handle successful response
+      function onSuccess(article) {
+        // Any required internal processing from inside the service, goes here.
+      }
+
+      // Handle error response
+      function onError(errorResponse) {
+        var error = errorResponse.data;
+        // Handle error internally
+        handleError(error);
+      }
+    }
+
+    function handleError(error) {
+      // Log error
+      $log.error(error);
+    }
+  }
+}());
diff --git a/viDoc/modules/articles/client/services/articles.client.service.js b/viDoc/modules/articles/client/services/articles.client.service.js
index 45aeff3..bf49d2e 100644
--- a/viDoc/modules/articles/client/services/articles.client.service.js
+++ b/viDoc/modules/articles/client/services/articles.client.service.js
@@ -8,7 +8,8 @@
   ArticlesService.$inject = ['$resource', '$log'];
 
   function ArticlesService($resource, $log) {
-    var Article = $resource('/api/folders/:folderId/articles/:articleId', {
+    var Article = $resource('/api/projects/:projectId/folders/:folderId/articles/:articleId', {
+      projectId: '@project',
       folderId: '@folder',
       articleId: '@_id'
     }, {
diff --git a/viDoc/modules/articles/client/views/admin/edit-articles.client.view.html b/viDoc/modules/articles/client/views/admin/edit-articles.client.view.html
index a7ef344..50da514 100644
--- a/viDoc/modules/articles/client/views/admin/edit-articles.client.view.html
+++ b/viDoc/modules/articles/client/views/admin/edit-articles.client.view.html
@@ -3,9 +3,10 @@
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <ul class="nav navbar-nav">
-        <li ng-if="!vm.inline"><a ui-sref="folders.view({ projectId: vm.projectId, folderName: vm.folderNameUrl })">
-        <span class="glyphicon glyphicon-folder-close" 
-        style="font-size: 12px;padding-right: 8px"></span>{{vm.folderNameNav}}</a></li>
+        <li ng-if="!vm.inline && vm.folderId"><a ui-sref="folders.view({ projectId: vm.projectId, folderId: vm.folderId })">
+        <span class="glyphicon glyphicon-arrow-left" style="font-size: 12px;padding-right: 8px"></span> Back</a></li>
+        <li ng-if="!vm.inline && !vm.folderId"><a ui-sref="projects.view({ projectId: vm.projectId })">
+        <span class="glyphicon glyphicon-arrow-left" style="font-size: 12px;padding-right: 8px"></span> Back</a></li>
         <li ng-if="vm.inline"><a href="#" ng-click="vm.close()"><span class="glyphicon glyphicon-arrow-left" style="font-size: 12px"></span> Back</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
diff --git a/viDoc/modules/articles/server/controllers/articles-project.server.controller.js b/viDoc/modules/articles/server/controllers/articles-project.server.controller.js
new file mode 100644
index 0000000..b62c13d
--- /dev/null
+++ b/viDoc/modules/articles/server/controllers/articles-project.server.controller.js
@@ -0,0 +1,148 @@
+'use strict';
+
+/**
+ * Module dependencies
+ */
+var path = require('path'),
+  mongoose = require('mongoose'),
+  Article = mongoose.model('Article'),
+  Project = mongoose.model('Project'),
+  errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller'));
+
+/**
+ * Create an article
+ */
+exports.create = function (req, res) {
+  var article = new Article(req.body);
+  var project = req.project;
+  article.user = req.user;
+  article.project = req.project;
+
+  article.save(err => {
+    if (err) {
+      return res.status(422).send({
+        message: errorHandler.getErrorMessage(err)
+      });
+    } else {
+      project.articles.push(article._id);
+      project.save(function (err) {
+        if (err) {
+          return res.status(422).send({
+            message: errorHandler.getErrorMessage(err)
+          });
+        }
+        res.json(article);
+      });
+    }
+  });
+};
+
+/**
+ * Show the current article
+ */
+exports.read = function (req, res) {
+  // convert mongoose document to JSON
+  var article = req.article ? req.article.toJSON() : {};
+
+  // Add a custom field to the Article, for determining if the current User is the "owner".
+  // NOTE: This field is NOT persisted to the database, since it doesn't exist in the Article model.
+  article.isCurrentUserOwner = !!(req.user && article.user && article.user._id.toString() === req.user._id.toString());
+
+  res.json(article);
+};
+
+/**
+ * Update an article
+ */
+exports.update = function (req, res) {
+  var article = req.article;
+
+  article.title = req.body.title;
+  article.content = req.body.content;
+
+  article.save(function (err) {
+    if (err) {
+      return res.status(422).send({
+        message: errorHandler.getErrorMessage(err)
+      });
+    } else {
+      res.json(article);
+    }
+  });
+};
+
+/**
+ * Delete an article
+ */
+exports.delete = function (req, res) {
+  var article = req.article;
+  var project = req.project;
+
+  article.remove(function (err) {
+    if (err) {
+      return res.status(422).send({
+        message: errorHandler.getErrorMessage(err)
+      });
+    } else {
+      project.articles.splice(project.articles.indexOf(article._id), 1);
+      project.save(err => {
+        if (err) {
+          return res.status(422).send({
+            message: errorHandler.getErrorMessage(err)
+          });
+        } else {
+          res.json(article);
+        }
+      });
+    }
+  });
+};
+
+/**
+ * List of Articles
+ */
+exports.list = function (req, res) {
+  Article.find().sort('-created').populate('user', 'displayName').exec(function (err, articles) {
+    if (err) {
+      return res.status(422).send({
+        message: errorHandler.getErrorMessage(err)
+      });
+    } else {
+      res.json(articles);
+    }
+  });
+};
+
+/**
+ * Article middleware
+ */
+exports.articleByID = function (req, res, next, id) {
+  if (mongoose.Types.ObjectId.isValid(id)) {
+    Article.findById(id)
+    .populate('user', 'displayName').exec(function (err, article) {
+      if (err) {
+        return next(err);
+      } else if (!article) {
+        return res.status(404).send({
+          message: 'No article with that identifier has been found'
+        });
+      }
+      req.article = article;
+      next();
+    });
+  } else {
+    var title = id.replace(/-/gi, ' ');
+    Article.findOne({ $and: [{ title: { $regex: title, $options: 'i' } }, { project: req.project._id }] })
+    .populate('user', 'displayName').exec(function (err, article) {
+      if (err) {
+        return next(err);
+      } else if (!article) {
+        return res.status(404).send({
+          message: 'No article with that identifier has been found'
+        });
+      }
+      req.article = article;
+      next();
+    });
+  }
+};
diff --git a/viDoc/modules/articles/server/models/article.server.model.js b/viDoc/modules/articles/server/models/article.server.model.js
index e8bc814..144df4d 100644
--- a/viDoc/modules/articles/server/models/article.server.model.js
+++ b/viDoc/modules/articles/server/models/article.server.model.js
@@ -32,6 +32,10 @@ var ArticleSchema = new Schema({
   folder: {
     type: Schema.ObjectId,
     ref: 'Folder'
+  },
+  project: {
+    type: Schema.ObjectId,
+    ref: 'Project'
   }
 });
 
diff --git a/viDoc/modules/articles/server/policies/articles.server.policy.js b/viDoc/modules/articles/server/policies/articles.server.policy.js
index 6efdf1b..54db9e0 100644
--- a/viDoc/modules/articles/server/policies/articles.server.policy.js
+++ b/viDoc/modules/articles/server/policies/articles.server.policy.js
@@ -15,20 +15,32 @@ exports.invokeRolesPolicies = function () {
   acl.allow([{
     roles: ['admin'],
     allows: [{
-      resources: '/api/folders/:folderId/articles',
+      resources: '/api/projects/:projectId/folders/:folderId/articles',
       permissions: '*'
     }, {
-      resources: '/api/folders/:folderId/articles/:articleId',
+      resources: '/api/projects/:projectId/folders/:folderId/articles/:articleId',
+      permissions: '*'
+    }, {
+      resources: '/api/projects/:projectId/articles',
+      permissions: '*'
+    }, {
+      resources: '/api/projects/:projectId/articles/:articleId',
       permissions: '*'
     }]
   }, {
     roles: ['user'],
     allows: [{
-      resources: '/api/folders/:folderId/articles',
+      resources: '/api/projects/:projectId/folders/:folderId/articles',
       permissions: ['*']
     }, {
-      resources: '/api/folders/:folderId/articles/:articleId',
+      resources: '/api/projects/:projectId/folders/:folderId/articles/:articleId',
       permissions: ['*']
+    }, {
+      resources: '/api/projects/:projectId/articles',
+      permissions: '*'
+    }, {
+      resources: '/api/projects/:projectId/articles/:articleId',
+      permissions: '*'
     }]
   }, {
     roles: ['guest'],
diff --git a/viDoc/modules/articles/server/routes/articles.server.routes.js b/viDoc/modules/articles/server/routes/articles.server.routes.js
index afec53e..829d36c 100644
--- a/viDoc/modules/articles/server/routes/articles.server.routes.js
+++ b/viDoc/modules/articles/server/routes/articles.server.routes.js
@@ -4,20 +4,32 @@
  * Module dependencies
  */
 var articlesPolicy = require('../policies/articles.server.policy'),
-  articles = require('../controllers/articles.server.controller');
+  articlesFolder = require('../controllers/articles.server.controller'),
+  articlesProject = require('../controllers/articles-project.server.controller');
 
 module.exports = function (app) {
-  // Articles collection routes
-  app.route('/api/folders/:folderId/articles').all(articlesPolicy.isAllowed)
-    .get(articles.list)
-    .post(articles.create);
+  // Articles collection routes in folder
+  app.route('/api/projects/:projectId/folders/:folderId/articles').all(articlesPolicy.isAllowed)
+    .get(articlesFolder.list)
+    .post(articlesFolder.create);
 
-  // Single article routes
-  app.route('/api/folders/:folderId/articles/:articleId').all(articlesPolicy.isAllowed)
-    .get(articles.read)
-    .put(articles.update)
-    .delete(articles.delete);
+  // Single article routes in folder
+  app.route('/api/projects/:projectId/folders/:folderId/articles/:articleId').all(articlesPolicy.isAllowed)
+    .get(articlesFolder.read)
+    .put(articlesFolder.update)
+    .delete(articlesFolder.delete);
+
+  // Articles collection routes in project
+  app.route('/api/projects/:projectId/articles').all(articlesPolicy.isAllowed)
+    .get(articlesProject.list)
+    .post(articlesProject.create);
+
+  // Single article routes in project
+  app.route('/api/projects/:projectId/articles/:articleId').all(articlesPolicy.isAllowed)
+    .get(articlesProject.read)
+    .put(articlesProject.update)
+    .delete(articlesProject.delete);
 
   // Finish by binding the article middleware
-  app.param('articleId', articles.articleByID);
+  app.param('articleId', articlesFolder.articleByID);
 };
diff --git a/viDoc/modules/folders/client/config/folders.client.config.js b/viDoc/modules/folders/client/config/folders.client.config.js
index a4f9a60..49cac5d 100644
--- a/viDoc/modules/folders/client/config/folders.client.config.js
+++ b/viDoc/modules/folders/client/config/folders.client.config.js
@@ -9,16 +9,5 @@
 
   function menuConfig(menuService) {
     // Set top bar menu items
-    menuService.addMenuItem('sidebar', {
-      title: 'Folders',
-      state: 'folders',
-      roles: ['*']
-    });
-
-    // Add the dropdown list item
-    menuService.addSubMenuItem('sidebar', 'folders', {
-      title: 'List Folders',
-      state: 'folders.list'
-    });
   }
 }());
diff --git a/viDoc/modules/folders/client/config/folders.client.routes.js b/viDoc/modules/folders/client/config/folders.client.routes.js
index a17358f..20ad923 100644
--- a/viDoc/modules/folders/client/config/folders.client.routes.js
+++ b/viDoc/modules/folders/client/config/folders.client.routes.js
@@ -37,7 +37,7 @@
         }
       })
       .state('folders.edit', {
-        url: '/:folderName/edit',
+        url: '/:folderId/edit',
         templateUrl: '/modules/folders/client/views/form-folder.client.view.html',
         controller: 'FoldersController',
         controllerAs: 'vm',
@@ -50,7 +50,7 @@
         }
       })
       .state('folders.view', {
-        url: '/:folderName',
+        url: '/:folderId',
         templateUrl: '/modules/folders/client/views/view-folder.client.view.html',
         controller: 'FoldersController',
         controllerAs: 'vm',
@@ -60,6 +60,18 @@
         data: {
           pageTitle: '{{ folderResolve.name }}'
         }
+      })
+      .state('folders.subfolder', {
+        url: '/:folderId/subfolder/create',
+        templateUrl: '/modules/folders/client/views/form-folder.client.view.html',
+        controller: 'FoldersController',
+        controllerAs: 'vm',
+        resolve: {
+          folderResolve: newSubfolder
+        },
+        data: {
+          pageTitle: '{{ folderResolve.name }}'
+        }
       });
   }
 
@@ -67,7 +79,8 @@
 
   function getFolder($stateParams, FoldersService) {
     return FoldersService.get({
-      folderId: $stateParams.folderName
+      projectId: $stateParams.projectId,
+      folderId: $stateParams.folderId
     }).$promise;
   }
 
@@ -76,4 +89,10 @@
   function newFolder(FoldersService) {
     return new FoldersService();
   }
+
+  newSubfolder.$inject = ['SubfoldersService'];
+
+  function newSubfolder(SubfoldersService) {
+    return new SubfoldersService();
+  }
 }());
diff --git a/viDoc/modules/folders/client/controllers/folders.client.controller.js b/viDoc/modules/folders/client/controllers/folders.client.controller.js
index 22402b7..f5fa12f 100644
--- a/viDoc/modules/folders/client/controllers/folders.client.controller.js
+++ b/viDoc/modules/folders/client/controllers/folders.client.controller.js
@@ -13,22 +13,26 @@
 
     vm.authentication = Authentication;
     vm.folder = folder;
-    vm.folderName = vm.folder.name ? vm.folder.name.replace(/ /gi, '-').toLowerCase() : '';
     vm.projectId = $state.params.projectId;
     vm.error = null;
     vm.form = {};
     vm.remove = remove;
     vm.save = save;
-    vm.articleName = function (name) {
-      return name.replace(/ /gi, '-').toLowerCase();
-    };
+
     // Remove existing Folder
     function remove() {
       if ($window.confirm('Are you sure you want to delete?')) {
         vm.folder.$remove(function() {
-          $state.go('projects.view', {
-            projectId: vm.projectId
-          });
+          if (vm.folder.parentfolder) {
+            $state.go('folders.view', {
+              projectId: $state.params.projectId,
+              folderId: vm.folder.parentfolder
+            });
+          } else {
+            $state.go('projects.view', {
+              projectId: $state.params.projectId,
+            });
+          }
         });
       }
     }
@@ -41,17 +45,27 @@
       }
 
       // TODO: move create/update logic to service
+      vm.folder.project = vm.projectId;
       if (vm.folder._id) {
         vm.folder.$update(successCallback, errorCallback);
       } else {
+        if ($state.params.folderId) {
+          vm.folder.parentfolder = $state.params.folderId;
+        }
         vm.folder.$save(successCallback, errorCallback);
       }
 
       function successCallback(res) {
-        $state.go('folders.view', {
-          projectId: vm.projectId,
-          folderName: res.name.replace(/ /gi, '-').toLowerCase()
-        });
+        if (vm.folder.parentfolder) {
+          $state.go('folders.view', {
+            projectId: vm.projectId,
+            folderId: vm.folder.parentfolder
+          });
+        } else {
+          $state.go('projects.view', {
+            projectId: vm.projectId,
+          });
+        }
       }
 
       function errorCallback(res) {
diff --git a/viDoc/modules/folders/client/controllers/list-folders.client.controller.js b/viDoc/modules/folders/client/controllers/list-folders.client.controller.js
index 5f8ad85..660f914 100644
--- a/viDoc/modules/folders/client/controllers/list-folders.client.controller.js
+++ b/viDoc/modules/folders/client/controllers/list-folders.client.controller.js
@@ -9,10 +9,6 @@
 
   function FoldersListController(FoldersService) {
     var vm = this;
-
     vm.folders = FoldersService.query();
-    vm.folderName = function (name) {
-      return name.replace(/ /gi, '-').toLowerCase();
-    };
   }
 }());
\ No newline at end of file
diff --git a/viDoc/modules/folders/client/services/folders.client.service.js b/viDoc/modules/folders/client/services/folders.client.service.js
index 65b6e83..22b2f06 100644
--- a/viDoc/modules/folders/client/services/folders.client.service.js
+++ b/viDoc/modules/folders/client/services/folders.client.service.js
@@ -9,7 +9,8 @@
   FoldersService.$inject = ['$resource'];
 
   function FoldersService($resource) {
-    return $resource('/api/folders/:folderId', {
+    return $resource('/api/projects/:projectId/folders/:folderId', {
+      projectId: '@project',
       folderId: '@_id'
     }, {
       update: {
diff --git a/viDoc/modules/folders/client/services/subfolder.client.service.js b/viDoc/modules/folders/client/services/subfolder.client.service.js
new file mode 100644
index 0000000..7084002
--- /dev/null
+++ b/viDoc/modules/folders/client/services/subfolder.client.service.js
@@ -0,0 +1,21 @@
+// Folders service used to communicate Folders REST endpoints
+(function () {
+  'use strict';
+
+  angular
+    .module('folders')
+    .factory('SubfoldersService', SubfoldersService);
+
+  SubfoldersService.$inject = ['$resource'];
+
+  function SubfoldersService($resource) {
+    return $resource('/api/projects/:projectId/folders/:folderId/subfolder', {
+      projectId: '@project',
+      folderId: '@parentfolder'
+    }, {
+      update: {
+        method: 'PUT'
+      }
+    });
+  }
+}());
diff --git a/viDoc/modules/folders/client/views/form-folder.client.view.html b/viDoc/modules/folders/client/views/form-folder.client.view.html
index 1226edd..9c93464 100644
--- a/viDoc/modules/folders/client/views/form-folder.client.view.html
+++ b/viDoc/modules/folders/client/views/form-folder.client.view.html
@@ -2,7 +2,7 @@
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <ul class="nav navbar-nav">
-        <li ng-if="vm.folder._id"><a ui-sref="folders.view({ projectId: vm.projectId, folderName: vm.folderName})">
+        <li ng-if="vm.folder._id"><a ui-sref="folders.view({projectId: vm.folder.project, folderId: vm.folder._id})">
         <span class="glyphicon glyphicon-arrow-left" 
         style="font-size: 12px;padding-right: 8px"></span> Back</a></li>
         <li ng-if="!vm.folder._id"><a ui-sref="projects.view({ projectId: vm.projectId })">
diff --git a/viDoc/modules/folders/client/views/view-folder.client.view.html b/viDoc/modules/folders/client/views/view-folder.client.view.html
index 391f165..bd10576 100644
--- a/viDoc/modules/folders/client/views/view-folder.client.view.html
+++ b/viDoc/modules/folders/client/views/view-folder.client.view.html
@@ -2,11 +2,13 @@
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <ul class="nav navbar-nav">
-        <li><a ui-sref="projects.view({ projectId: vm.projectId })"><span class="glyphicon glyphicon-arrow-left" style="font-size: 12px; padding-right: 8px"></span> Back</a></li>
+        <li ng-if="!vm.folder.parentfolder"><a ui-sref="projects.view({ projectId: vm.folder.project })"><span class="glyphicon glyphicon-arrow-left" style="font-size: 12px; padding-right: 8px"></span> Back</a></li>
+        <li ng-if="vm.folder.parentfolder"><a ui-sref="folders.view({ projectId: vm.folder.project, folderId: vm.folder.parentfolder })"><span class="glyphicon glyphicon-arrow-left" style="font-size: 12px; padding-right: 8px"></span> Back</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a ui-sref="articles.create({projectId: vm.projectId, folderName: vm.folderName})"><span class="glyphicon glyphicon-plus" style="font-size: 12px"></span> New Article</a></li>
-        <li><a ui-sref="folders.edit({ folderName: vm.folderName })"><span class="glyphicon glyphicon-pencil" style="font-size: 12px"></span> Edit</a></li>
+        <li><a ui-sref="folders.subfolder({ projectId: vm.projectId, folderId: vm.folder._id })"><span class="glyphicon glyphicon-plus" style="font-size: 12px"></span> New Folder</a></li>
+        <li><a ui-sref="articles.create({projectId: vm.folder.project, folderId: vm.folder._id})"><span class="glyphicon glyphicon-plus" style="font-size: 12px"></span> New Article</a></li>
+        <li><a ui-sref="folders.edit({ folderId: vm.folder._id })"><span class="glyphicon glyphicon-pencil" style="font-size: 12px"></span> Edit</a></li>
         <li><a href="#" ng-click="vm.remove()""><span class="glyphicon glyphicon-trash" style="font-size: 12px"></span> Delete</a></li>
       </ul>
     </div>
@@ -18,8 +20,21 @@ <h1 style="color: #555" ng-bind="vm.folder.name"></h1>
     <h4 style="color: #868686" ng-bind="vm.folder.describe"></h4>
   </div>
   <div class="list-group">
+    <a ng-repeat="subfolder in vm.folder.subfolders"
+       ui-sref="folders.view({ projectId: vm.folder.project, folderId: subfolder._id })"
+       class="list-group-item" style="border-right: none; border-left: none">
+      <div style="">
+        <span class="glyphicon glyphicon-folder-close" style="float: left; font-size: 20px;padding-top: 6px; padding-right: 16px"></span>
+        <h2 class="list-group-item-heading" style="color: #f0ad4e" ng-bind="subfolder.name"></h2>
+      </div>
+      <div style="color: #868686;margin-top: 8px">
+        <span class="glyphicon glyphicon-triangle-right" style="font-size: 8px; padding: 4px 8px 0 0;float: left;"></span>
+        <span class="glyphicon glyphicon-file" style="font-size: 12px; padding: 2px 8px 0 0;float: left;"></span>
+        <p class="list-group-item-text" ng-bind="subfolder.articles.length + ' Articles'"></p>
+      </div>
+    </a>
     <a class="list-group-item" ng-repeat="article in vm.folder.articles" 
-    ui-sref="articles.edit({ projectId: vm.projectId, folderName: vm.folderName, articleId: vm.articleName(article.title) })" style="border-right: none;border-left: none;">
+    ui-sref="articles.edit({ projectId: vm.folder.project, folderId: vm.folder._id, articleId: article._id })" style="border-right: none;border-left: none;">
       <div>
         <span class="glyphicon glyphicon-file" style="font-size: 20px; padding: 6px 8px 0 0;float: left;"></span>
         <h2 class="list-group-item-heading" style="color: #337ab7" ng-bind="article.title"></h2>
@@ -29,7 +44,8 @@ <h2 class="list-group-item-heading" style="color: #337ab7" ng-bind="article.titl
       <span ng-bind="article.user.displayName"></span></p>
     </a>
   </div>
-  <div class="alert alert-warning text-center" ng-if="!vm.folder.articles.length">
-    No article are currently in this folder. <a ui-sref="articles.create({projectId: vm.projectId, folderName: vm.folderName })">create one</a>?
+  <div class="alert alert-warning text-center" ng-if="!vm.folder.articles.length && vm.folder.subfolders.length">
+    No article are currently in this folder. <a ui-sref="articles.create({projectId: vm.folder.project, folderId: vm.folder._id })">create articles</a>
+    <a ui-sref="folders.subfolder({projectId: vm.folder.project, folderId: vm.folder._id })">create folder</a>
   </div>
 </section>
diff --git a/viDoc/modules/folders/server/controllers/folders.server.controller.js b/viDoc/modules/folders/server/controllers/folders.server.controller.js
index 57c2be4..81d1eae 100644
--- a/viDoc/modules/folders/server/controllers/folders.server.controller.js
+++ b/viDoc/modules/folders/server/controllers/folders.server.controller.js
@@ -17,7 +17,7 @@ var path = require('path'),
 exports.create = function(req, res) {
   var folder = new Folder(req.body);
   folder.user = req.user;
-  folder.project = req.project || req.user;
+  folder.project = req.project;
 
   folder.save(function(err) {
     if (err) {
@@ -25,33 +25,80 @@ exports.create = function(req, res) {
         message: errorHandler.getErrorMessage(err)
       });
     } else {
-      res.jsonp(folder);
+      var project = req.project;
+      project.folders.push(folder._id);
+      project.save(err => {
+        if (err) {
+          return res.status(400).send({
+            message: errorHandler.getErrorMessage(err)
+          });
+        }
+        res.jsonp(folder);
+      });
     }
   });
 };
 
 /**
- * Show the current Folder
+ * Create a subFolder
  */
-exports.read = function(req, res) {
-  // convert mongoose document to JSON
-  var folder = req.folder ? req.folder.toJSON() : {};
+exports.createSub = function(req, res) {
+  var subFolder = new Folder(req.body);
+  subFolder.user = req.user;
+  subFolder.parentfolder = req.folder._id;
 
-  // Add a custom field to the Folder, for determining if the current User is the "owner".
-  // NOTE: This field is NOT persisted to the database, since it doesn't exist in the Folder model.
-  folder.isCurrentUserOwner = req.user && folder.user && folder.user._id.toString() === req.user._id.toString();
-  Article.find({ _id: folder.articles }).sort('-created').populate('user', 'displayName').exec(function(err, articles) {
+  subFolder.save(function(err) {
     if (err) {
       return res.status(400).send({
         message: errorHandler.getErrorMessage(err)
       });
     } else {
-      folder.articles = articles;
-      res.jsonp(folder);
+      var folder = req.folder;
+      folder.subfolders.push(subFolder._id);
+      folder.save(err => {
+        if (err) {
+          return res.status(400).send({
+            message: errorHandler.getErrorMessage(err)
+          });
+        }
+        res.jsonp(subFolder);
+      });
     }
   });
 };
 
+/**
+ * Show the current Folder
+ */
+exports.read = function(req, res) {
+  // convert mongoose document to JSON
+  var folder = req.folder ? req.folder.toJSON() : {};
+
+  // Add a custom field to the Folder, for determining if the current User is the "owner".
+  // NOTE: This field is NOT persisted to the database, since it doesn't exist in the Folder model.
+  folder.isCurrentUserOwner = req.user && folder.user && folder.user._id.toString() === req.user._id.toString();
+  Article.find({ _id: folder.articles }, { 'created': 1, 'title': 1, 'user': 1}).sort('-created')
+    .populate('user', 'displayName').exec(function(err, articles) {
+      if (err) {
+        return res.status(400).send({
+          message: errorHandler.getErrorMessage(err)
+        });
+      } else {
+        folder.articles = articles;
+        Folder.find({ _id: folder.subfolders }).sort('-created')
+          .populate('user', 'displayName').exec(function(err, folders) {
+            if (err) {
+              return res.status(400).send({
+                message: errorHandler.getErrorMessage(err)
+              });
+            }
+            folder.subfolders = folders;
+            res.jsonp(folder);
+          });
+      }
+    });
+};
+
 /**
  * Update a Folder
  */
@@ -76,6 +123,7 @@ exports.update = function(req, res) {
  */
 exports.delete = function(req, res) {
   var folder = req.folder;
+  var project = req.project;
 
   folder.remove(function(err) {
     if (err) {
@@ -83,7 +131,28 @@ exports.delete = function(req, res) {
         message: errorHandler.getErrorMessage(err)
       });
     } else {
-      res.jsonp(folder);
+      if (folder.parentfolder) {
+        Folder.updateOne({ _id: folder.parentfolder }, {
+          $pull: { subfolders: folder._id }
+        }, function (err, parentfolder) {
+          if (err) {
+            return res.status(400).send({
+              message: errorHandler.getErrorMessage(err)
+            });
+          }
+          res.jsonp(folder);
+        });
+      } else {
+        project.folders.splice(project.folders.indexOf(folder._id), 1);
+        project.save(err => {
+          if (err) {
+            return res.status(400).send({
+              message: errorHandler.getErrorMessage(err)
+            });
+          }
+          res.jsonp(folder);
+        });
+      }
     }
   });
 };
diff --git a/viDoc/modules/folders/server/models/folder.server.model.js b/viDoc/modules/folders/server/models/folder.server.model.js
index 0111758..8dbeba9 100644
--- a/viDoc/modules/folders/server/models/folder.server.model.js
+++ b/viDoc/modules/folders/server/models/folder.server.model.js
@@ -35,6 +35,10 @@ var FolderSchema = new Schema({
     type: Schema.ObjectId,
     ref: 'User'
   },
+  parentfolder: {
+    type: Schema.ObjectId,
+    ref: 'Folder'
+  },
   user: {
     type: Schema.ObjectId,
     ref: 'User'
diff --git a/viDoc/modules/folders/server/policies/folders.server.policy.js b/viDoc/modules/folders/server/policies/folders.server.policy.js
index b2a7a10..881e0ca 100644
--- a/viDoc/modules/folders/server/policies/folders.server.policy.js
+++ b/viDoc/modules/folders/server/policies/folders.server.policy.js
@@ -15,28 +15,34 @@ exports.invokeRolesPolicies = function () {
   acl.allow([{
     roles: ['admin'],
     allows: [{
-      resources: '/api/folders',
+      resources: '/api/projects/:projectId/folders',
       permissions: '*'
     }, {
-      resources: '/api/folders/:folderId',
+      resources: '/api/projects/:projectId/folders/:folderId',
+      permissions: '*'
+    }, {
+      resources: '/api/projects/:projectId/folders/:folderId/subfolder',
       permissions: '*'
     }]
   }, {
     roles: ['user'],
     allows: [{
-      resources: '/api/folders',
+      resources: '/api/projects/:projectId/folders',
       permissions: ['*']
     }, {
-      resources: '/api/folders/:folderId',
+      resources: '/api/projects/:projectId/folders/:folderId',
       permissions: ['*']
+    }, {
+      resources: '/api/projects/:projectId/folders/:folderId/subfolder',
+      permissions: '*'
     }]
   }, {
     roles: ['guest'],
     allows: [{
-      resources: '/api/folders',
+      resources: '/api/projects/:projectId/folders',
       permissions: ['get']
     }, {
-      resources: '/api/folders/:folderId',
+      resources: '/api/projects/:projectId/folders/:folderId',
       permissions: ['get']
     }]
   }]);
diff --git a/viDoc/modules/folders/server/routes/folders.server.routes.js b/viDoc/modules/folders/server/routes/folders.server.routes.js
index c0c3f2c..b03fcf8 100644
--- a/viDoc/modules/folders/server/routes/folders.server.routes.js
+++ b/viDoc/modules/folders/server/routes/folders.server.routes.js
@@ -8,15 +8,18 @@ var foldersPolicy = require('../policies/folders.server.policy'),
 
 module.exports = function(app) {
   // Folders Routes
-  app.route('/api/folders').all(foldersPolicy.isAllowed)
+  app.route('/api/projects/:projectId/folders').all(foldersPolicy.isAllowed)
     .get(folders.list)
     .post(folders.create);
 
-  app.route('/api/folders/:folderId').all(foldersPolicy.isAllowed)
+  app.route('/api/projects/:projectId/folders/:folderId').all(foldersPolicy.isAllowed)
     .get(folders.read)
     .put(folders.update)
     .delete(folders.delete);
 
+  app.route('/api/projects/:projectId/folders/:folderId/subfolder').all(foldersPolicy.isAllowed)
+    .post(folders.createSub);
+
   // Finish by binding the Folder middleware
   app.param('folderId', folders.folderByID);
 };
diff --git a/viDoc/modules/projects/client/controllers/projects.client.controller.js b/viDoc/modules/projects/client/controllers/projects.client.controller.js
index 90bd4cf..1a91c3f 100644
--- a/viDoc/modules/projects/client/controllers/projects.client.controller.js
+++ b/viDoc/modules/projects/client/controllers/projects.client.controller.js
@@ -17,15 +17,12 @@
     vm.form = {};
     vm.remove = remove;
     vm.save = save;
-    vm.close= close;
+    vm.close = close;
     // Remove existing Project
-    vm.folderName = function (name) {
-      return name.replace(/ /gi, '-').toLowerCase();
-    };
     function remove() {
       if ($window.confirm('Are you sure you want to delete?')) {
         vm.project.$remove(function() {
-          $state.go('projects.list')
+          $state.go('projects.list');
         });
       }
     }
diff --git a/viDoc/modules/projects/client/projects.client.module.js b/viDoc/modules/projects/client/projects.client.module.js
index a932875..4425229 100644
--- a/viDoc/modules/projects/client/projects.client.module.js
+++ b/viDoc/modules/projects/client/projects.client.module.js
@@ -1,6 +1,6 @@
 (function (app) {
   'use strict';
 
-  app.registerModule('projects',['core']);
+  app.registerModule('projects', ['core']);
   app.registerModule('project.routes', ['ui.router', 'core.routes']);
 }(ApplicationConfiguration));
diff --git a/viDoc/modules/projects/client/views/list-projects.client.view.html b/viDoc/modules/projects/client/views/list-projects.client.view.html
index 2540381..2af91ae 100644
--- a/viDoc/modules/projects/client/views/list-projects.client.view.html
+++ b/viDoc/modules/projects/client/views/list-projects.client.view.html
@@ -9,7 +9,7 @@
 </section>
 <section>
   <div class="list-group">
-    <a ng-repeat="project in vm.projects" ui-sref="projects.view({ projectId: vm.projectName(project.name) })"
+    <a ng-repeat="project in vm.projects" ui-sref="projects.view({ projectId: project._id })"
        class="list-group-item" style="border-right: none; border-left: none">
       <div style="">
         <span class="glyphicon glyphicon-book" style="float: left; font-size: 20px;padding-top: 6px; padding-right: 16px"></span>
diff --git a/viDoc/modules/projects/client/views/view-project.client.view.html b/viDoc/modules/projects/client/views/view-project.client.view.html
index bfe80ee..3ce97b5 100644
--- a/viDoc/modules/projects/client/views/view-project.client.view.html
+++ b/viDoc/modules/projects/client/views/view-project.client.view.html
@@ -5,8 +5,9 @@
         <li><a ui-sref="projects.list"><span class="glyphicon glyphicon-arrow-left" style="font-size: 12px; padding-right: 8px"></span> Back</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a ui-sref="folders.create({ projectId: vm.folderName(vm.project.name) })"><span class="glyphicon glyphicon-plus" style="font-size: 12px"></span> New Folder</a></li>
-        <li><a ui-sref="projects.edit"><span class="glyphicon glyphicon-pencil" style="font-size: 12px"></span> Edit</a></li>
+        <li><a ui-sref="folders.create({ projectId: vm.project._id })"><span class="glyphicon glyphicon-plus" style="font-size: 12px"></span> New Folder</a></li>
+        <li><a ui-sref="article.create({ projectId: vm.project._id})"><span class="glyphicon glyphicon-plus" style="font-size: 12px"></span> New Article</a></li>
+        <li><a ui-sref="projects.edit({ projectId: vm.project._id })"><span class="glyphicon glyphicon-pencil" style="font-size: 12px"></span> Edit</a></li>
         <li><a href="#" ng-click="vm.remove()"><span class="glyphicon glyphicon-trash" style="font-size: 12px"></span> Delete</a></li>
       </ul>
     </div>
@@ -19,7 +20,7 @@ <h4 style="color: #868686" ng-bind="vm.project.description"></h4>
   </div>
   <div class="list-group">
     <a ng-repeat="folder in vm.project.folders"
-       ui-sref="folders.view({ projectId: vm.folderName(vm.project.name), folderName: vm.folderName(folder.name) })"
+       ui-sref="folders.view({ projectId: vm.project._id, folderId: folder._id })"
        class="list-group-item" style="border-right: none; border-left: none">
       <div style="">
         <span class="glyphicon glyphicon-folder-close" style="float: left; font-size: 20px;padding-top: 6px; padding-right: 16px"></span>
@@ -31,8 +32,20 @@ <h2 class="list-group-item-heading" style="color: #f0ad4e" ng-bind="folder.name"
         <p class="list-group-item-text" ng-bind="folder.articles.length + ' Articles'"></p>
       </div>
     </a>
+    <a class="list-group-item" ng-repeat="article in vm.project.articles" 
+    ui-sref="article.edit({ projectId: vm.project._id, articleId: article._id })" style="border-right: none;border-left: none;">
+      <div>
+        <span class="glyphicon glyphicon-file" style="font-size: 20px; padding: 6px 8px 0 0;float: left;"></span>
+        <h2 class="list-group-item-heading" style="color: #337ab7" ng-bind="article.title"></h2>
+      </div>
+      <p class="list-group-item-text" style="color: #868686">Posted on 
+      <span ng-bind="article.created | date:'mediumDate'"></span> by 
+      <span ng-bind="article.user.displayName"></span></p>
+    </a>
   </div>
-  <div class="alert alert-warning text-center" ng-if="!vm.project.folders.length">
-    No Folders yet, why don't you <a ui-sref="folders.create({ projectId: vm.folderName(vm.project.name) })">create one</a>?
+  <div class="alert alert-warning text-center"
+   ng-if="!vm.project.folders.length && !vm.project.articles.length">
+    No Folders yet, why don't you <a ui-sref="folders.create({ projectId: vm.project._id })">create one article</a> 
+    <a ui-sref="article.create({ projectId: vm.project._id })">create one folder</a>
   </div>
 </section>
diff --git a/viDoc/modules/projects/server/controllers/projects.server.controller.js b/viDoc/modules/projects/server/controllers/projects.server.controller.js
index 20c204d..2489fb6 100644
--- a/viDoc/modules/projects/server/controllers/projects.server.controller.js
+++ b/viDoc/modules/projects/server/controllers/projects.server.controller.js
@@ -6,6 +6,7 @@
 var path = require('path'),
   mongoose = require('mongoose'),
   Project = mongoose.model('Project'),
+  Article = mongoose.model('Article'),
   Folder = mongoose.model('Folder'),
   errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller')),
   _ = require('lodash');
@@ -40,14 +41,21 @@ exports.read = function(req, res) {
   project.isCurrentUserOwner = req.user && project.user && project.user._id.toString() === req.user._id.toString();
   Folder.find({ _id: project.folders }).populate('user', 'displayName').exec(function (err, folders) {
     if (err) {
-      return next(err);
-    } else if (!folders) {
       return res.status(404).send({
         message: 'No Folder with that identifier has been found'
       });
     }
     project.folders = folders;
-    res.jsonp(project);
+    Article.find({ _id: project.articles }, { 'created': 1, 'title': 1, 'user': 1 }).sort('-created')
+      .populate('user', 'displayName').exec(function (err, articles) {
+        if (err) {
+          return res.status(404).send({
+            message: 'No Folder with that identifier has been found'
+          });
+        }
+        project.articles = articles;
+        res.jsonp(project);
+      });
   });
 };
 
diff --git a/viDoc/modules/projects/server/models/project.server.model.js b/viDoc/modules/projects/server/models/project.server.model.js
index 09d773e..65cf763 100644
--- a/viDoc/modules/projects/server/models/project.server.model.js
+++ b/viDoc/modules/projects/server/models/project.server.model.js
@@ -22,7 +22,7 @@ var ProjectSchema = new Schema({
   },
   articles: {
     type: Array,
-    default:[]
+    default: []
   },
   tag: {
     type: Array,
@@ -32,7 +32,7 @@ var ProjectSchema = new Schema({
     type: Array,
     default: []
   },
-  description :{
+  description: {
     type: String,
     default: ''
   },