diff --git a/app/index.js b/app/index.js
index 25db4cc..38cffb3 100644
--- a/app/index.js
+++ b/app/index.js
@@ -29,6 +29,21 @@ var AppGenerator = module.exports = function AppGenerator(args, options, config)
             }
         };
         this.config.set('inject', inject);
+        var defaultModules = [
+            {
+                "name": "home",
+                "file": path.join('app/home', 'home.js')
+            },
+            {
+                "name": "help",
+                "file": path.join('app/help', 'help.js')
+            },
+            {
+                "name": "common",
+                "file": path.join('app/common', 'common.js')
+            }
+        ];
+        this.config.set('modules', defaultModules);
         this.config.save();
         this.installDependencies({ skipInstall: options['skip-install'] });
     });
@@ -60,12 +75,12 @@ AppGenerator.prototype.askForUiRouter = function askFor() {
         name: 'router',
         type:'list',
         message: 'Which router would you like to use?',
-        default: 0,
-        choices: ['Standard Angular Router','Angular UI Router']
+        default: 1,
+        choices: ['Standard Angular Router(ngRoute)', 'Angular UI Router(ui.router)']
     }];
 
     this.prompt(prompts, function (props) {
-        if (props.router === 'Angular UI Router') {
+        if (props.router === 'Angular UI Router(ui.router)') {
             this.uirouter = true;
             this.routerJs = 'bower_components/angular-ui-router/release/angular-ui-router.js';
             this.routerModuleName = 'ui.router';
diff --git a/app/templates/skeleton/Gruntfile.js b/app/templates/skeleton/Gruntfile.js
index 290a00f..4c60182 100644
--- a/app/templates/skeleton/Gruntfile.js
+++ b/app/templates/skeleton/Gruntfile.js
@@ -231,7 +231,7 @@ module.exports = function (grunt) {
 
     //if index.html changed, we need to reread the <script> tags so our next run of karma
     //will have the correct environment
-    if (filepath === 'index.html') {//Tapas:Need to check later if got an issue
+    if (filepath === 'app/index.html') {
       tasksToRun.push('dom_munger:read');
     }
 
diff --git a/app/templates/skeleton/README.md b/app/templates/skeleton/README.md
index 339a762..f975479 100644
--- a/app/templates/skeleton/README.md
+++ b/app/templates/skeleton/README.md
@@ -1,4 +1,4 @@
-#generator-ngappgen
+#generator-ng-appgen
 
 >Yeoman Generator for Enterprise Angular Projects
 
@@ -71,13 +71,13 @@ Prerequisites: Node, Grunt, Yeoman, and Bower.  Once Node is installed, do:
 
 Next, install this generator:
 
-    npm install -g generator-ngappgen
+    npm install -g generator-ng-appgen
 
 To create a project:
 
     mkdir MyApp
     cd MyApp
-    yo ngappgen
+    yo ng-appgen
 
 Grunt Tasks
 -------------
@@ -104,13 +104,13 @@ There are generators for `directive`, `template`, `service`, `filter`, `module`,
 
 Running a generator:
 
-    yo ngappgen:directive my-awesome-directive
-    yo ngappgen:template my-template
-    yo ngappgen:service my-service
-    yo ngappgen:service my-controller
-    yo ngappgen:filter my-filter
-    yo ngappgen:module my-module
-    yo ngappgen:modal my-modal
+    yo ng-appgen:directive my-awesome-directive
+    yo ng-appgen:template my-template
+    yo ng-appgen:service my-service
+    yo ng-appgen:service my-controller
+    yo ng-appgen:filter my-filter
+    yo ng-appgen:module my-module
+    yo ng-appgen:modal my-modal
 
 The name paramater passed (i.e. 'my-awesome-directive') will be used as the file names.  The generators will derive appropriate class names from this parameter (ex. 'my-awesome-directive' will convert to a class name of 'MyAwesomeDirective').  Each sub-generator will ask for the folder in which to create the new skeleton files.  You may override the default folder for each sub-generator in the `.yo-rc.json` file.
 
diff --git a/app/templates/skeleton/app/app.js b/app/templates/skeleton/app/app.js
index ba1013f..35bd5c9 100644
--- a/app/templates/skeleton/app/app.js
+++ b/app/templates/skeleton/app/app.js
@@ -3,12 +3,12 @@
 
     /**
      * This is the main application file.
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
      */
-    angular.module('<%= _.camelize(appname) %>', ['ui.bootstrap','ui.utils','<%= routerModuleName %>','ngAnimate']);
+    angular.module('<%= _.camelize(appname) %>', ['ui.bootstrap','ui.utils', '<%= routerModuleName %>', 'ngAnimate', 'restangular', 'angular-loading-bar', 'home', 'help', 'common']);
     <% if (!uirouter) { %>
     angular.module('<%= _.camelize(appname) %>').config(function($routeProvider) {
 
diff --git a/app/templates/skeleton/app/app.less b/app/templates/skeleton/app/app.less
index e273219..069d36c 100644
--- a/app/templates/skeleton/app/app.less
+++ b/app/templates/skeleton/app/app.less
@@ -1,22 +1,14 @@
 @import "../bower_components/bootstrap/less/bootstrap.less";
-//@import "bower_components/bootstrap/less/theme.less";
+@import "../bower_components/bootstrap/less/theme.less";
 @import "../bower_components/font-awesome/less/font-awesome.less";
 @fa-font-path: "../bower_components/font-awesome/fonts";
 
 /* Component LESS */
+@import "home/home.less";
+@import "help/help.less";
+@import "common/common.less";
 /* Add Component LESS Above */
 
 /* Required for Angular UI Bootstrap */
 .nav, .pagination, .carousel a { cursor: pointer; }
 
-/* Personal preference for BS modal.  The LESS below makes the backdrop white and
-   causes the modal to fade in rather than slide in. */
-//@modal-backdrop-bg: white;
-//.modal {
-//	&.fade {
-//		.transition(opacity .3s);
-//	}
-//	&.fade .modal-dialog {
-//		.translate(0,0);
-//	}
-//}
diff --git a/app/templates/skeleton/app/assets/fonts/Curvic Oblique.ttf b/app/templates/skeleton/app/assets/fonts/Curvic Oblique.ttf
new file mode 100644
index 0000000..cefd723
Binary files /dev/null and b/app/templates/skeleton/app/assets/fonts/Curvic Oblique.ttf differ
diff --git a/app/templates/skeleton/app/common/common.js b/app/templates/skeleton/app/common/common.js
new file mode 100644
index 0000000..b43e01d
--- /dev/null
+++ b/app/templates/skeleton/app/common/common.js
@@ -0,0 +1,26 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample module for all application level common tasks
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('common', ['ui.bootstrap', 'ui.utils', '<%= routerModuleName %>', 'ngAnimate', 'restangular']);
+    <% if (!uirouter) { %>
+    angular.module('common').config(function($routeProvider) {
+
+        /* Add New Routes Above */
+
+    });
+    <% } %><% if (uirouter) { %>
+    angular.module('common').config(function($stateProvider) {
+
+        /* Add New States Above */
+
+    });
+    <% } %>
+
+})();
diff --git a/app/templates/skeleton/app/common/common.less b/app/templates/skeleton/app/common/common.less
new file mode 100644
index 0000000..2f8395e
--- /dev/null
+++ b/app/templates/skeleton/app/common/common.less
@@ -0,0 +1,3 @@
+/* Component LESS */
+/* Add Component LESS Above */
+
diff --git a/app/templates/skeleton/app/common/controllers/common-controller-spec.js b/app/templates/skeleton/app/common/controllers/common-controller-spec.js
new file mode 100644
index 0000000..f02d659
--- /dev/null
+++ b/app/templates/skeleton/app/common/controllers/common-controller-spec.js
@@ -0,0 +1,31 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample controller spec
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    describe('commonController', function() {
+
+        var scope, ctrl;
+
+        beforeEach(module('common'));
+
+        beforeEach(inject(function($rootScope, $controller) {
+            scope = $rootScope.$new();
+            ctrl = $controller('commonController', {$scope: scope});
+        }));
+
+        it('should ...', inject(function(commonController) {
+
+            //TODO: Implement your controller spec logic here
+            //expect(commonController.doSomething()).toEqual('something');
+
+        }));
+
+    });
+
+})();
diff --git a/app/templates/skeleton/app/common/controllers/common-controller.js b/app/templates/skeleton/app/common/controllers/common-controller.js
new file mode 100644
index 0000000..5c9204c
--- /dev/null
+++ b/app/templates/skeleton/app/common/controllers/common-controller.js
@@ -0,0 +1,18 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample controller for application level common tasks
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('common').controller('commonController', ['$scope', function($scope) {
+
+        //TODO: Implement your controller logic here
+
+    }]);
+
+
+})();
diff --git a/app/templates/skeleton/app/common/services/common-service-spec.js b/app/templates/skeleton/app/common/services/common-service-spec.js
new file mode 100644
index 0000000..2a6d0d4
--- /dev/null
+++ b/app/templates/skeleton/app/common/services/common-service-spec.js
@@ -0,0 +1,24 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample service spec
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    describe('commonService', function() {
+
+      beforeEach(module('common'));
+
+      it('should ...', inject(function(commonService) {
+
+            //TODO: Implement your service spec logic here
+            //expect(commonService.doSomething()).toEqual('something');
+
+      }));
+
+    });
+
+})();
diff --git a/app/templates/skeleton/app/common/services/common-service.js b/app/templates/skeleton/app/common/services/common-service.js
new file mode 100644
index 0000000..85ffcd6
--- /dev/null
+++ b/app/templates/skeleton/app/common/services/common-service.js
@@ -0,0 +1,18 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample service
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('common').service('commonService', ['$http', '$q', function($http, $q) {
+
+        //TODO: Implement your service logic here
+
+    }]);
+
+
+})();
diff --git a/app/templates/skeleton/app/help/controllers/help-controller-spec.js b/app/templates/skeleton/app/help/controllers/help-controller-spec.js
new file mode 100644
index 0000000..985ee89
--- /dev/null
+++ b/app/templates/skeleton/app/help/controllers/help-controller-spec.js
@@ -0,0 +1,31 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample controller spec
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    describe('helpController', function() {
+
+        var scope, ctrl;
+
+        beforeEach(module('help'));
+
+        beforeEach(inject(function($rootScope, $controller) {
+            scope = $rootScope.$new();
+            ctrl = $controller('helpController', {$scope: scope});
+        }));
+
+        it('should ...', inject(function(helpController) {
+
+            //TODO: Implement your controller spec logic here
+            //expect(helpController.doSomething()).toEqual('something');
+
+        }));
+
+    });
+
+})();
diff --git a/app/templates/skeleton/app/help/controllers/help-controller.js b/app/templates/skeleton/app/help/controllers/help-controller.js
new file mode 100644
index 0000000..a13e626
--- /dev/null
+++ b/app/templates/skeleton/app/help/controllers/help-controller.js
@@ -0,0 +1,17 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample controller
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('help').controller('helpController', ['$scope', 'loadContent', function($scope, loadContent) {
+
+        $scope.helpContentList = loadContent;
+
+    }]);
+
+})();
diff --git a/app/templates/skeleton/app/help/help.js b/app/templates/skeleton/app/help/help.js
new file mode 100644
index 0000000..2029d12
--- /dev/null
+++ b/app/templates/skeleton/app/help/help.js
@@ -0,0 +1,45 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample module
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('help', ['ui.bootstrap', 'ui.utils', '<%= routerModuleName %>', 'ngAnimate', 'restangular']);
+    <% if (!uirouter) { %>
+    angular.module('help').config(function($routeProvider) {
+
+        $routeProvider.when('/help', {
+            templateUrl: 'help/templates/help-template.html',
+            controller: 'helpController',
+            resolve: {
+                loadContent: function( helpService ){
+                    return helpService.getHelpContent();
+                }
+            }
+        });
+        /* Add New Routes Above */
+
+    });
+    <% } %><% if (uirouter) { %>
+    angular.module('help').config(function($stateProvider) {
+
+        $stateProvider.state('help-template', {
+            url: '/help',
+            templateUrl: 'help/templates/help-template.html',
+            controller: 'helpController',
+            resolve: {
+                loadContent: function( helpService ){
+                    return helpService.getHelpContent();
+                }
+            }
+        });
+        /* Add New States Above */
+
+    });
+    <% } %>
+
+})();
diff --git a/app/templates/skeleton/app/help/help.less b/app/templates/skeleton/app/help/help.less
new file mode 100644
index 0000000..42526fb
--- /dev/null
+++ b/app/templates/skeleton/app/help/help.less
@@ -0,0 +1,4 @@
+/* Component LESS */
+@import "templates/help-template.less";
+/* Add Component LESS Above */
+
diff --git a/app/templates/skeleton/app/help/services/help-service-spec.js b/app/templates/skeleton/app/help/services/help-service-spec.js
new file mode 100644
index 0000000..a495325
--- /dev/null
+++ b/app/templates/skeleton/app/help/services/help-service-spec.js
@@ -0,0 +1,24 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample service spec
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    describe('helpService', function() {
+
+      beforeEach(module('help'));
+
+      it('should ...', inject(function(helpService) {
+
+            //TODO: Implement your service spec logic here
+            //expect(helpService.doSomething()).toEqual('something');
+
+      }));
+
+    });
+
+})();
diff --git a/app/templates/skeleton/app/help/services/help-service.js b/app/templates/skeleton/app/help/services/help-service.js
new file mode 100644
index 0000000..ab6530b
--- /dev/null
+++ b/app/templates/skeleton/app/help/services/help-service.js
@@ -0,0 +1,32 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample service
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('help').service('helpService', ['$http', '$q', function($http, $q) {
+
+        var helpContent = [];
+
+        this.getHelpContent = function(){
+            var deferred = $q.defer();
+
+            if(helpContent.length === 0) {
+                $http.get('/data/help.json').success(function (helpData) {
+                    helpContent = helpData;
+                    deferred.resolve(helpContent);
+                });
+            }else{
+                deferred.resolve(helpContent);
+            }
+
+            return deferred.promise;
+        };
+
+    }]);
+
+})();
diff --git a/app/templates/skeleton/app/help/templates/help-template.html b/app/templates/skeleton/app/help/templates/help-template.html
new file mode 100644
index 0000000..be7b297
--- /dev/null
+++ b/app/templates/skeleton/app/help/templates/help-template.html
@@ -0,0 +1,8 @@
+<div class="container">
+	<h1 class="text-danger">Help Needed?</h1>
+	<br/>
+	<p class="text-justify">Thank you for your interest on Anitech, you are important to us. We are eager to serve you. Please call or e-mail us to know more about our customized business solutions. Please submit your request below. Your question will then be routed to the appropriate person, and you will receive a response shortly.</p>
+    <ul>
+        <li ng-repeat="help in helpContentList"> {{ help.title }} - {{ help.content }}</li>
+    </ul>
+</div>
diff --git a/app/templates/skeleton/app/help/templates/help-template.less b/app/templates/skeleton/app/help/templates/help-template.less
new file mode 100644
index 0000000..e69de29
diff --git a/app/templates/skeleton/app/home/controllers/home-controller-spec.js b/app/templates/skeleton/app/home/controllers/home-controller-spec.js
new file mode 100644
index 0000000..1e8450a
--- /dev/null
+++ b/app/templates/skeleton/app/home/controllers/home-controller-spec.js
@@ -0,0 +1,31 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample controller spec
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    describe('homeController', function() {
+
+        var scope, ctrl;
+
+        beforeEach(module('home'));
+
+        beforeEach(inject(function($rootScope, $controller) {
+            scope = $rootScope.$new();
+            ctrl = $controller('homeController', {$scope: scope});
+        }));
+
+        it('should ...', inject(function(homeController) {
+
+            //TODO: Implement your controller spec logic here
+            //expect(homeController.doSomething()).toEqual('something');
+
+        }));
+
+    });
+
+})();
diff --git a/app/templates/skeleton/app/home/controllers/home-controller.js b/app/templates/skeleton/app/home/controllers/home-controller.js
new file mode 100644
index 0000000..5bf3cdc
--- /dev/null
+++ b/app/templates/skeleton/app/home/controllers/home-controller.js
@@ -0,0 +1,18 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample controller
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('home').controller('homeController', ['$scope', 'homeService', function($scope, homeService) {
+
+        // get message from service
+        $scope.message = homeService.getMessage();
+
+    }]);
+
+})();
diff --git a/app/templates/skeleton/app/home/home.js b/app/templates/skeleton/app/home/home.js
new file mode 100644
index 0000000..311b7f8
--- /dev/null
+++ b/app/templates/skeleton/app/home/home.js
@@ -0,0 +1,35 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample module
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('home', ['ui.bootstrap', 'ui.utils', '<%= routerModuleName %>', 'ngAnimate', 'restangular']);
+    <% if (!uirouter) { %>
+    angular.module('home').config(function($routeProvider) {
+
+        $routeProvider.when('/home', {
+            templateUrl: 'home/templates/home-template.html',
+            controller: 'homeController'
+        });
+        /* Add New Routes Above */
+
+    });
+    <% } %><% if (uirouter) { %>
+    angular.module('home').config(function($stateProvider) {
+
+        $stateProvider.state('home-template', {
+            url: '/home',
+            templateUrl: 'home/templates/home-template.html',
+            controller: 'homeController'
+        });
+        /* Add New States Above */
+
+    });
+    <% } %>
+
+})();
diff --git a/app/templates/skeleton/app/home/home.less b/app/templates/skeleton/app/home/home.less
new file mode 100644
index 0000000..2af47ae
--- /dev/null
+++ b/app/templates/skeleton/app/home/home.less
@@ -0,0 +1,4 @@
+/* Component LESS */
+@import "templates/home-template.less";
+/* Add Component LESS Above */
+
diff --git a/app/templates/skeleton/app/home/services/home-service-spec.js b/app/templates/skeleton/app/home/services/home-service-spec.js
new file mode 100644
index 0000000..8cd26e8
--- /dev/null
+++ b/app/templates/skeleton/app/home/services/home-service-spec.js
@@ -0,0 +1,24 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample service spec
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    describe('homeService', function() {
+
+      beforeEach(module('home'));
+
+      it('should ...', inject(function(homeService) {
+
+            //TODO: Implement your service spec logic here
+            //expect(homeService.doSomething()).toEqual('something');
+
+      }));
+
+    });
+
+})();
diff --git a/app/templates/skeleton/app/home/services/home-service.js b/app/templates/skeleton/app/home/services/home-service.js
new file mode 100644
index 0000000..1c12709
--- /dev/null
+++ b/app/templates/skeleton/app/home/services/home-service.js
@@ -0,0 +1,25 @@
+(function(){
+    'use strict';
+
+    /**
+     * This is a sample service
+     * Generated by ng-appgen Yeomen/Angular generator.
+     *
+     * @author: Tapas Jena
+     * @copyright: Anitech Consulting Services Pvt Ltd.
+     */
+    angular.module('home').service('homeService', ['$http', '$q', function($http, $q) {
+
+        var message = '';
+
+        this.getMessage = function(){
+            if(message === ''){
+                message = 'Congratulations! Your app is fully up and running.';
+            }
+
+            return message;
+        };
+
+    }]);
+
+})();
diff --git a/app/templates/skeleton/app/home/templates/home-template.html b/app/templates/skeleton/app/home/templates/home-template.html
new file mode 100644
index 0000000..04a9031
--- /dev/null
+++ b/app/templates/skeleton/app/home/templates/home-template.html
@@ -0,0 +1,7 @@
+<div class="container">
+	<h1 class="text-success"> {{ message }} </h1>
+	<br/>
+	<p class="text-justify">Anitech Consulting Services Pvt Ltd. is an innovative software development and information technology(IT) consulting service provider with offshore development center in Hyderabad, India. We provide offshore outsourcing solutions to enterprises worldwide. Combining proven expertise in technology, and an understanding of emerging business domains, Anitech delivers a range of outsourcing services that includes Enterprise Product Suites, Custom Application Development, ERP Solution, Mobile Application Development, Multimedia Design and IT Consulting Services. We have specialized software expertise to help your business operate more efficiently respond to customers, secure sensitive information, manage growth and control costs.</p>
+	<br/>
+    <p><a class="btn btn-lg btn-success" href="http://www.anitechcs.com" role="button">Visit Anitech Now!</a></p>
+</div>
diff --git a/app/templates/skeleton/app/home/templates/home-template.less b/app/templates/skeleton/app/home/templates/home-template.less
new file mode 100644
index 0000000..f5a5097
--- /dev/null
+++ b/app/templates/skeleton/app/home/templates/home-template.less
@@ -0,0 +1,104 @@
+.navbar {
+  border: 0;
+  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .26);
+}
+
+.navbar-header {
+  float: left;
+  padding-left: 15px;
+}
+
+.navbar-nav {
+  float: left;
+  margin: 0;
+}
+
+.navbar-nav > li {
+  float: left;
+}
+
+.navbar-nav > li > a {
+  padding: 15px;
+}
+
+.navbar-default {
+  color: #fff;
+  background: #fff;
+  font-weight: bold;
+}
+
+.navbar-default .navbar-brand {
+  color: #030300;
+  background-color: #0080ff;
+}
+
+.navbar-default .navbar-brand:hover {
+  color: #0080FF;
+  background-color: #030300;
+}
+
+.navbar-brand {
+  margin-left: -15px;
+  transition: 0.25s all;
+}
+
+/*********************
+* Animations
+*********************/
+
+.fadeZoom.ng-enter {
+  -webkit-animation-duration: 0.6s, 0.2s;
+  -moz-animation-duration: 0.2s, 0.2s;
+  -ms-animation-duration: 0.2s, 0.2s;
+  animation-duration: 0.2, 0.2s;
+  -webkit-animation-name: fadeIn, zoomIn;
+  -moz-animation-name: fadeIn, zoomIn;
+  -ms-animation-name: fadeIn, zoomIn;
+  animation-name: fadeIn, zoomIn;
+}
+
+.fadeZoomFadeDown.ng-enter {
+  -webkit-animation-duration: 0.2s, 0.2s;
+  -moz-animation-duration: 0.2s, 0.2s;
+  -ms-animation-duration: 0.2s, 0.2s;
+  animation-duration: 0.2s, 0.2s;
+  -webkit-animation-name: fadeIn, zoomIn;
+  -moz-animation-name: fadeIn, zoomIn;
+  -ms-animation-name: fadeIn, zoomIn;
+  animation-name: fadeIn, zoomIn;
+}
+
+.fadeZoomFadeDown.ng-leave {
+  -webkit-animation: fadeOutDown 0.2s;
+  -moz-animation: fadeOutDown 0.2s;
+  -ms-animation: fadeOutDown 0.2s;
+  animation: fadeOutDown 0.2s;
+}
+
+@-webkit-keyframes zoomIn {
+  0% {
+    opacity: 0;
+    -webkit-transform: scale3d(0.8, 0.8, 0.8);
+    -moz-transform: scale3d(0.8, 0.8, 0.8);
+    -ms-transform: scale3d(0.8, 0.8, 0.8);
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+
+  50% {
+    opacity: 1;
+  }
+}
+
+@keyframes zoomIn {
+  0% {
+    opacity: 0;
+    -webkit-transform: scale3d(0.8, 0.8, 0.8);
+    -moz-transform: scale3d(0.8, 0.8, 0.8);
+    -ms-transform: scale3d(0.8, 0.8, 0.8);
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+
+  50% {
+    opacity: 1;
+  }
+}
diff --git a/app/templates/skeleton/app/index.html b/app/templates/skeleton/app/index.html
index e498513..fcac3d4 100644
--- a/app/templates/skeleton/app/index.html
+++ b/app/templates/skeleton/app/index.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <html ng-app="<%= _.camelize(appname) %>">
 <head>
-  <title>ngAppGen - Angular Application Generator</title>
+  <title>ng-AppGen - Angular Application Generator</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta charset="utf-8">
-  <link href="app.less" type="text/css" rel="stylesheet/less">
+  <link href="../bower_components/angular-loading-bar/build/loading-bar.min.css" type="text/css" rel="stylesheet" />
+  <link href="app.less" type="text/css" rel="stylesheet/less" />
 </head>
 <body>
 
@@ -13,7 +14,7 @@
 
   <!-- JS from Bower Components -->
   <script src="../bower_components/less.js/dist/less-1.6.2.js" data-concat="false"></script>
-  <script src="../bower_components/jquery/jquery.js"></script>
+  <script src="../bower_components/jquery/dist/jquery.js"></script>
   <script src="../bower_components/bootstrap/dist/js/bootstrap.js"></script>
   <script src="../bower_components/underscore/underscore.js"></script>
   <script src="../bower_components/moment/moment.js"></script>
@@ -23,17 +24,28 @@
   <script src="../bower_components/angular-resource/angular-resource.js"></script>
   <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
   <script src="../bower_components/angular-ui-utils/ui-utils.js"></script>
+  <script src="../bower_components/angular-loading-bar/build/loading-bar.js"></script>
+  <script src="../bower_components/restangular/dist/restangular.js"></script>
   <!-- Add New Bower Component JS Above -->
 
   <!-- Main App JS -->
   <script src="app.js"></script>
+  <script src="home/home.js"></script>
+  <script src="home/controllers/home-controller.js"></script>
+  <script src="home/services/home-service.js"></script>
+  <script src="help/help.js"></script>
+  <script src="help/controllers/help-controller.js"></script>
+  <script src="help/services/help-service.js"></script>
+  <script src="common/common.js"></script>
+  <script src="common/controllers/common-controller.js"></script>
+  <script src="common/services/common-service.js"></script>
   <!-- Add New Component JS Above -->
 
   <div class="fadeZoom">
 
       <div class="navbar navbar-default navbar-static-top">
           <div class="navbar-header">
-              <a class="navbar-brand" href="/"><i class="ion-ios7-pulse-strong"></i> ngAppGen </a>
+              <a class="navbar-brand" href="/app"><i class="fa fa-spinner fa-spin"></i> ng-AppGen </a>
           </div>
           <ul class="nav navbar-nav">
               <li><a href="/app/#/home">Home</a></li>
@@ -41,7 +53,7 @@
           </ul>
       </div>
 
-      <div id="content" class="container" <%= routerViewDirective %>>
+      <div id="content" class="container" <%= routerViewDirective %> >
           <!-- Content will goes here -->
       </div>
 
diff --git a/app/templates/skeleton/bower.json b/app/templates/skeleton/bower.json
index 7778779..b29d1b0 100644
--- a/app/templates/skeleton/bower.json
+++ b/app/templates/skeleton/bower.json
@@ -8,20 +8,22 @@
     "bower_components"
   ],
   "dependencies": {
-    "jquery": "~2.0",
-    "underscore": "~1.5",
-    "bootstrap": "~3.1",
-    "angular": "~1.3.0",
-    <% if(uirouter) { print('"angular-ui-router": "~0.2",'); } else { print('"angular-route": "~1.2",'); } %>
-    "angular-animate": "~1.3.0",
-    "angular-resource": "~1.3.0",
-    "angular-cookies": "~1.3.0",
-    "angular-mocks": "~1.3.0",
+    "jquery": "~2.1.1",
+    "underscore": "~1.7.0",
+    "bootstrap": "~3.3.0",
+    "angular": "~1.3.2",
+    <% if(uirouter) { print('"angular-ui-router": "~0.2.11",'); } else { print('"angular-route": "~1.3.2",'); } %>
+    "angular-animate": "~1.3.2",
+    "angular-resource": "~1.3.2",
+    "angular-cookies": "~1.3.2",
+    "angular-mocks": "~1.3.2",
     "angular-ui-utils": "~0.1.1",
     "angular-bootstrap": "~0.11.2",
     "restangular": "~1.0.11",
     "moment": "~2.5",
-    "less.js": "~1.6",
-    "font-awesome": "~4.0"
+    "less.js": "~1.7.5",
+    "font-awesome": "~4.2.0",
+	"angular-loading-bar": "~0.6.0"
   }
+
 }
diff --git a/app/templates/skeleton/data/help.json b/app/templates/skeleton/data/help.json
new file mode 100644
index 0000000..4629b73
--- /dev/null
+++ b/app/templates/skeleton/data/help.json
@@ -0,0 +1,18 @@
+[
+    {
+        "title": "Technical Help",
+        "content": "Contact us at tech@anitechcs.com"
+    },
+    {
+        "title" : "Billing Help",
+        "content" : "Contact us at billing@anitechcs.com"
+    },
+    {
+        "title" : "Enquiry Help",
+        "content" : "Contact us at info@anitechcs.com"
+    },
+    {
+        "title" : "Sales Help",
+        "content" : "Contact us at sales@anitechcs.com"
+    }
+]
diff --git a/app/templates/skeleton/package.json b/app/templates/skeleton/package.json
index d4cab9f..b8db72c 100644
--- a/app/templates/skeleton/package.json
+++ b/app/templates/skeleton/package.json
@@ -1,30 +1,36 @@
 {
-  "name": "<%= _.slugify(appname) %>",
-  "version": "0.0.1",
-  "devDependencies": {
-    "grunt": "~0.4",
-    "grunt-dom-munger": "~3.4",
-    "grunt-angular-templates": "~0.5",
-    "grunt-ngmin": "0.0.3",
-    "grunt-contrib-connect": "~0.6",
-    "grunt-contrib-copy": "~0.5",
-    "grunt-contrib-clean": "~0.5",
-    "grunt-contrib-concat": "~0.3",
-    "grunt-contrib-cssmin": "~0.7",
-    "grunt-contrib-uglify": "~0.2",
-    "grunt-contrib-jshint": "~0.9",
-    "grunt-contrib-htmlmin": "~0.1",
-    "grunt-contrib-imagemin": "~0.4",
-    "grunt-contrib-less": "~0.8",
-    "grunt-contrib-watch": "~0.6",
-    "grunt-browser-output": "0.1.0",
-    "load-grunt-tasks": "~0.2",
-    "karma": "~0.12.6",
-    "grunt-karma": "~0.8.3",
-    "karma-jasmine": "~0.1.5",
-    "karma-phantomjs-launcher": "~0.1.4",
-    "karma-chrome-launcher": "~0.1.3",
-    "karma-mocha-reporter": "~0.2.5",
-    "karma-firefox-launcher": "~0.1.3"
-  }
+    "name": "<%= _.slugify(appname) %>",
+    "version": "0.0.1",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/<%= _.slugify(appname).git"
+    },
+    "devDependencies": {
+        "grunt": "~0.4.5",
+        "grunt-dom-munger": "~3.4",
+        "grunt-angular-templates": "~0.5.7",
+        "grunt-ngmin": "0.0.3",
+        "grunt-contrib-connect": "~0.9.0",
+        "grunt-contrib-copy": "~0.7.0",
+        "grunt-contrib-clean": "~0.6.0",
+        "grunt-contrib-concat": "~0.5.0",
+        "grunt-contrib-cssmin": "~0.10.0",
+        "grunt-contrib-uglify": "~0.6.0",
+        "grunt-contrib-jshint": "~0.10.0",
+        "grunt-contrib-htmlmin": "~0.3.0",
+        "grunt-contrib-imagemin": "~0.9.1",
+        "grunt-contrib-less": "~0.12.0",
+        "grunt-contrib-watch": "~0.6.1",
+        "grunt-browser-output": "1.0.3",
+        "load-grunt-tasks": "~1.0.0",
+        "karma": "~0.12.24",
+        "grunt-karma": "~0.9.0",
+        "karma-jasmine": "~0.2.3",
+        "karma-phantomjs-launcher": "~0.1.4",
+        "karma-chrome-launcher": "~0.1.5",
+        "karma-mocha-reporter": "~0.3.1",
+        "karma-firefox-launcher": "~0.1.3",
+        "protractor": "1.4.0",
+        "webdriver-manager": "1.0.0"
+    }
 }
diff --git a/app/templates/skeleton/test/karma.conf.js b/app/templates/skeleton/test/karma.conf.js
new file mode 100644
index 0000000..bc45452
--- /dev/null
+++ b/app/templates/skeleton/test/karma.conf.js
@@ -0,0 +1,72 @@
+module.exports = function(config){
+
+  config.set({
+
+   /**
+    * From where to look for files, starting with the location of this file.
+    */
+    basePath : './',
+
+    /**
+     * This is the list of file patterns to load into the browser during testing.
+     */
+    files : [
+      '../bower_components/angular/angular.js',
+      '../bower_components/angular-route/angular-route.js',
+      '../bower_components/angular-mocks/angular-mocks.js',
+      '../tests/**/**/*.js'
+    ],
+
+    /**
+     * Exclude karma and protractor conf files
+     */
+    exclude: [
+        '../tests/karma-conf.js',
+        '../tests/protractor-conf.js'
+    ],
+
+    /**
+     * Automatically runs tests when you save any test file
+     */
+    autoWatch : true,
+
+    /**
+     * Frameworks to use for unit testing
+     */
+    frameworks: ['jasmine'],
+
+    /**
+     * Browser to use for running unit tests
+     * values: Chrome, Firefox, Opera, Safari, PhantomJS etc.
+     */
+    browsers : ['Chrome'],
+
+    /**
+     * Plugins required to run karma
+     */
+    plugins : [
+        'karma-chrome-launcher',
+        'karma-firefox-launcher',
+        'karma-jasmine',
+        'karma-junit-reporter',
+        'karma-phantomjs-launcher'
+    ],
+
+    /**
+     * How to report, by default.
+     */
+    junitReporter : {
+      outputFile: 'test_out/unit.xml',
+      suite: 'unit'
+    },
+
+    /**
+     * On which port should the browser connect, on which port is the test runner
+     * operating, and what is the URL path for the browser to use.
+     */
+      port: 9000,
+      runnerPort: 9001,
+      urlRoot: '/app'
+
+  });
+};
diff --git a/controller/templates/controller-spec.js b/controller/templates/controller-spec.js
index fc5eec1..e521a33 100644
--- a/controller/templates/controller-spec.js
+++ b/controller/templates/controller-spec.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample controller spec
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/controller/templates/controller.js b/controller/templates/controller.js
index 2bdc134..50b14af 100644
--- a/controller/templates/controller.js
+++ b/controller/templates/controller.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample controller
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
@@ -11,7 +11,6 @@
     angular.module('<%= appname %>').controller('<%= _.camelize(name) %>', ['$scope', function($scope) {
 
         //TODO: Implement your controller logic here
-        $scope.message = 'Bang Bang! Your application is up and running.';
 
     }]);
 
diff --git a/directive/templates/complex/directive-spec.js b/directive/templates/complex/directive-spec.js
index 4e1ce7e..3908eed 100644
--- a/directive/templates/complex/directive-spec.js
+++ b/directive/templates/complex/directive-spec.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample directive spec
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/directive/templates/complex/directive.js b/directive/templates/complex/directive.js
index 5fca0a9..112a5b3 100644
--- a/directive/templates/complex/directive.js
+++ b/directive/templates/complex/directive.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample directive
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/directive/templates/simple/directive-spec.js b/directive/templates/simple/directive-spec.js
index 7801b8e..11e8f59 100644
--- a/directive/templates/simple/directive-spec.js
+++ b/directive/templates/simple/directive-spec.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample directive spec
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/directive/templates/simple/directive.js b/directive/templates/simple/directive.js
index 772f781..46f03b0 100644
--- a/directive/templates/simple/directive.js
+++ b/directive/templates/simple/directive.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample directive
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/filter/templates/filter-spec.js b/filter/templates/filter-spec.js
index a5ce23f..033a8fa 100644
--- a/filter/templates/filter-spec.js
+++ b/filter/templates/filter-spec.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample filter spec
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/filter/templates/filter.js b/filter/templates/filter.js
index 88e29c9..50984d6 100644
--- a/filter/templates/filter.js
+++ b/filter/templates/filter.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample filter
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/modal/templates/modal-spec.js b/modal/templates/modal-spec.js
index bd5a7ac..6515065 100644
--- a/modal/templates/modal-spec.js
+++ b/modal/templates/modal-spec.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample modal spec
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/modal/templates/modal.js b/modal/templates/modal.js
index ebf44b6..ee73af6 100644
--- a/modal/templates/modal.js
+++ b/modal/templates/modal.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample modal
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/module/templates/module.js b/module/templates/module.js
index d447702..418f7ba 100644
--- a/module/templates/module.js
+++ b/module/templates/module.js
@@ -3,12 +3,12 @@
 
     /**
      * This is a sample module
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
      */
-    angular.module('<%= _.camelize(name) %>', ['ui.bootstrap','ui.utils','<%= routerModuleName %>','ngAnimate']);
+    angular.module('<%= _.camelize(name) %>', ['ui.bootstrap', 'ui.utils', '<%= routerModuleName %>', 'ngAnimate', 'restangular']);
     <% if (!uirouter) { %>
     angular.module('<%= _.camelize(name) %>').config(function($routeProvider) {
 
diff --git a/package.json b/package.json
index 25b00e8..726a954 100644
--- a/package.json
+++ b/package.json
@@ -24,24 +24,19 @@
     "test": "mocha"
   },
   "dependencies": {
-    "underscore": "~1.5",
-    "underscore.string": "~2.3",
-    "yeoman-generator": "~0.16",
-    "chalk": "~0.4.0",
+    "underscore": "~1.7.0",
+    "underscore.string": "~2.3.3",
+    "yeoman-generator": "~0.17.7",
+    "chalk": "~0.5.1",
     "ng-parse-module": "~0.1.0"
   },
   "devDependencies": {
-    "mocha": "~1.10.0"
+    "mocha": "~2.0.1"
   },
   "engines": {
-    "node": ">=0.8.0"
+    "node": ">=0.10.32"
   },
   "license": "Apache License 2.0",
-  "gitHead": "b914a9ee640da4a50a62261965a2a338799256cd",
-  "_id": "generator-ng-appgen@1.0.0",
-  "_shasum": "fea9925b26b050e35855a5b0fea5b8237d1e5a7a",
-  "_from": "generator-ng-appgen@",
-  "_npmVersion": "1.5.0-alpha-1",
   "_npmUser": {
     "name": "tapas4java",
     "email": "tapas.friends@gmail.com"
@@ -51,12 +46,5 @@
       "name": "Tapas Jena",
       "email": "tapas.friends@gmail.com"
     }
-  ],
-  "dist": {
-    "shasum": "fea9925b26b050e35855a5b0fea5b8237d1e5a7a",
-    "tarball": "http://registry.npmjs.org/generator-ngappgen/-/generator-ng-appgen-1.0.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "http://registry.npmjs.org/generator-ngappgen/-/generator-ng-appgen-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  ]
 }
diff --git a/service/templates/service-spec.js b/service/templates/service-spec.js
index c88ca4f..af621ee 100644
--- a/service/templates/service-spec.js
+++ b/service/templates/service-spec.js
@@ -3,7 +3,7 @@
 
     /**
      * This is a sample service spec
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
diff --git a/service/templates/service.js b/service/templates/service.js
index 928f468..4158bcc 100644
--- a/service/templates/service.js
+++ b/service/templates/service.js
@@ -3,17 +3,14 @@
 
     /**
      * This is a sample service
-     * Generated by ngappgen Yeomen/Angular generator.
+     * Generated by ng-appgen Yeomen/Angular generator.
      *
      * @author: Tapas Jena
      * @copyright: Anitech Consulting Services Pvt Ltd.
      */
-    angular.module('<%= appname %>').service('<%= _.camelize(name) %>', ['$http', function($http) {
+    angular.module('<%= appname %>').service('<%= _.camelize(name) %>', ['$http', '$q', function($http, $q) {
 
         //TODO: Implement your service logic here
-        this.getMessage = function(){
-            return 'Bang Bang! Your application is up and running.';
-        };
 
     }]);
 
diff --git a/test/test-creation.js b/test/test-creation.js
index 843f60a..38a17ad 100644
--- a/test/test-creation.js
+++ b/test/test-creation.js
@@ -5,14 +5,14 @@
     var helpers = require('yeoman-generator').test;
 
 
-    describe('ngappgen generator', function () {
+    describe('ng-appgen generator', function () {
       beforeEach(function (done) {
         helpers.testDirectory(path.join(__dirname, 'temp'), function (err) {
           if (err) {
             return done(err);
           }
 
-          this.app = helpers.createGenerator('ngappgen:app', [
+          this.app = helpers.createGenerator('ng-appgen:app', [
             '../../app'
           ]);
           done();
diff --git a/test/test-load.js b/test/test-load.js
index 4898c1a..8c5a79e 100644
--- a/test/test-load.js
+++ b/test/test-load.js
@@ -3,7 +3,7 @@
 
     var assert  = require('assert');
 
-    describe('ngappgen generator', function () {
+    describe('ng-appgen generator', function () {
       it('can be imported without blowing up', function () {
         var app = require('../app');
         assert(app !== undefined);