Moved GUI in VIEWS
diff --git a/gui/README.md b/gui/README.md
deleted file mode 100644
index b7bdc57..0000000
--- a/gui/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# ngXosLib
-
-This is a collection of helpers to develop views as Angular SPA.
-
-## Tools
-
-These tools are designed to help develop a GUI view. They assume XOS is running on your system and responding at: `localhost:9999`. The `xos/configurations/frontend` is normally sufficient for GUI development.
-
-### Apigen
-
-Usage: `npm run apigen`
-
-This tool automatically generates an angular resource file for each endpoint available in Swagger.
-
->You can generate api related documentation with: `npm run apidoc`. The output is locate in `api/docs`. You can also see a list of available methods through Swagger at `http://localhost:9999/docs/`
-
-### Vendors
-
-XOS comes with a preset of common libraries, as listed in `bower.json`:
-- angular
-- angular-route
-- angular-resource
-- angular-cookie
-- ng-lodash
-
-These libraries are served through Django, so they will not be included in your minified vendor file. To add a library and generate a new file (that will override the old one), you should:
-- enter `ngXosLib` folder
-- run `bower install [myPackage] --save`
-- rebuild the file with `gulp vendor`
-
->_NOTE before adding libraries please discuss it to avoid this file to became huge_
-
-### Helpers
-
-XOS comes with an helper library that is automatically loaded in the Django template.
-
-To use it, add `xos.helpers` to your required modules:
-
-```
-angular.module('xos.myView', [
- 'xos.helpers'
-])
-```
-
-It will automatically ad a `token` to all your requests, eventually you can take advantage of some other services:
-
-- **NoHyperlinks Interceptor**: will add a `?no_hyperlinks=1` to your request, to tell Django to return ids instead of links.
-- **XosApi** wrapper for `/xos` endpoints.
-- **XoslibApi** wrapper for `/xoslib` endpoints.
-- **HpcApi** wrapper for `/hpcapi` endpoints.
-
->_NOTE: for the API related service, check documentation in [Apigen](#apigen) section._
-
-# ngXosViews
-
-On top of auto-generated Django Admin Views and developer-defined Service Views, a set of custom views can be generate in XOS.
-
-These views are based on AngularJs and they communicate with XOS through the REST APIs, providing a powerful and flexible way to present and manage data.
-
-## How to create a View
-
-### Getting Started
-
-We have created a [yeoman](http://yeoman.io/) generator to help you scaffolding views.
-
->As it is in an early stage of development you should manually link it to your system, to do this enter `/gui/ngXosLib/generator-xos` and run `npm link`.
-
-#### To generate a new view
-
-From `/gui` run `yo xos`. This command will create a new folder with the provided name in: `/gui/ngXosViews` that contain your application.
-
->If you left empty the view name it should be `/gui/ngXosViews/sampleView`
-
-#### Run a development server
-
-In your `view` folder and run `npm start`.
-
-_This will install required dependencies and start a local server with [BrowserSync](http://www.browsersync.io/)_
-
-#### Publish your view
-
-Once your view is done, from your view root folder, run: `npm run build`.
-
-This will build your application and copy files in the appropriate locations to be used by django.
-
-At this point you can enter: `http://localhost:9999/admin/core/dashboardview/add/` and add your custom view.
-
->_NOTE url field should be `template:xosSampleView`_
-
-##### Add this view to a configuration setup
-
-You can easily set this as a default view in a configuration just editing the `{config}.yml` file for that configuration, adding this lines:
-
-```
-{TabName}:
- type: tosca.nodes.DashboardView
- properties:
- url: template:{viewName}
-```
-
-and the edit the _User_ section (normally it starts with `padmin@vicci.org`) in this way:
-
-```
-padmin@vicci.org:
- type: tosca.nodes.User
- properties:
- firstname: XOS
- lastname: admin
- is_admin: true
- requirements:
- - tenant_dashboard:
- node: Tenant
- relationship: tosca.relationships.UsesDashboard
- - {custom_dashboard}:
- node: {TabName}
- relationship: tosca.relationships.UsesDashboard
-```
-
-#### Install dependencies in your app
-
-To install a local dependency use bower with `--save`. Common modules are saved in `devDependencies` as they already loaded in the Django template.
-
-The `npm start` command is watching your dependencies and will automatically inject it in your `index.html`.
-
-#### Linting
-
-A styleguide is enforced trough [EsLint](http://eslint.org/) and is checked during the build process. We **highly** suggest to install the linter in your editor to have realtime hint.
-
-#### Test
-
-The generator set up a test environment with a default test.
-To run it execute: `npm test`
-
diff --git a/gui/.yo-rc.json b/views/gui/.yo-rc.json
similarity index 100%
rename from gui/.yo-rc.json
rename to views/gui/.yo-rc.json
diff --git a/gui/ngXosLib/.bowerrc b/views/gui/ngXosLib/.bowerrc
similarity index 100%
rename from gui/ngXosLib/.bowerrc
rename to views/gui/ngXosLib/.bowerrc
diff --git a/gui/ngXosLib/.gitignore b/views/gui/ngXosLib/.gitignore
similarity index 100%
rename from gui/ngXosLib/.gitignore
rename to views/gui/ngXosLib/.gitignore
diff --git a/gui/ngXosLib/README.md b/views/gui/ngXosLib/README.md
similarity index 100%
rename from gui/ngXosLib/README.md
rename to views/gui/ngXosLib/README.md
diff --git a/gui/ngXosLib/api/.gitignore b/views/gui/ngXosLib/api/.gitignore
similarity index 100%
rename from gui/ngXosLib/api/.gitignore
rename to views/gui/ngXosLib/api/.gitignore
diff --git a/gui/ngXosLib/api/ng-hpcapi.js b/views/gui/ngXosLib/api/ng-hpcapi.js
similarity index 100%
rename from gui/ngXosLib/api/ng-hpcapi.js
rename to views/gui/ngXosLib/api/ng-hpcapi.js
diff --git a/gui/ngXosLib/api/ng-xos.js b/views/gui/ngXosLib/api/ng-xos.js
similarity index 100%
rename from gui/ngXosLib/api/ng-xos.js
rename to views/gui/ngXosLib/api/ng-xos.js
diff --git a/gui/ngXosLib/api/ng-xoslib.js b/views/gui/ngXosLib/api/ng-xoslib.js
similarity index 100%
rename from gui/ngXosLib/api/ng-xoslib.js
rename to views/gui/ngXosLib/api/ng-xoslib.js
diff --git a/gui/ngXosLib/apiTemplates/custom-angular-class.mustache b/views/gui/ngXosLib/apiTemplates/custom-angular-class.mustache
similarity index 100%
rename from gui/ngXosLib/apiTemplates/custom-angular-class.mustache
rename to views/gui/ngXosLib/apiTemplates/custom-angular-class.mustache
diff --git a/gui/ngXosLib/bower.json b/views/gui/ngXosLib/bower.json
similarity index 100%
rename from gui/ngXosLib/bower.json
rename to views/gui/ngXosLib/bower.json
diff --git a/gui/ngXosLib/generator-xos/app/index.js b/views/gui/ngXosLib/generator-xos/app/index.js
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/index.js
rename to views/gui/ngXosLib/generator-xos/app/index.js
diff --git a/gui/ngXosLib/generator-xos/app/templates/.bowerrc b/views/gui/ngXosLib/generator-xos/app/templates/.bowerrc
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/.bowerrc
rename to views/gui/ngXosLib/generator-xos/app/templates/.bowerrc
diff --git a/gui/ngXosLib/generator-xos/app/templates/.eslintrc b/views/gui/ngXosLib/generator-xos/app/templates/.eslintrc
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/.eslintrc
rename to views/gui/ngXosLib/generator-xos/app/templates/.eslintrc
diff --git a/gui/ngXosLib/generator-xos/app/templates/.gitignore b/views/gui/ngXosLib/generator-xos/app/templates/.gitignore
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/.gitignore
rename to views/gui/ngXosLib/generator-xos/app/templates/.gitignore
diff --git a/gui/ngXosLib/generator-xos/app/templates/bower.json b/views/gui/ngXosLib/generator-xos/app/templates/bower.json
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/bower.json
rename to views/gui/ngXosLib/generator-xos/app/templates/bower.json
diff --git a/gui/ngXosLib/generator-xos/app/templates/env/default.js b/views/gui/ngXosLib/generator-xos/app/templates/env/default.js
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/env/default.js
rename to views/gui/ngXosLib/generator-xos/app/templates/env/default.js
diff --git a/gui/ngXosLib/generator-xos/app/templates/gulp/build.js b/views/gui/ngXosLib/generator-xos/app/templates/gulp/build.js
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/gulp/build.js
rename to views/gui/ngXosLib/generator-xos/app/templates/gulp/build.js
diff --git a/gui/ngXosLib/generator-xos/app/templates/gulp/server.js b/views/gui/ngXosLib/generator-xos/app/templates/gulp/server.js
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/gulp/server.js
rename to views/gui/ngXosLib/generator-xos/app/templates/gulp/server.js
diff --git a/gui/ngXosLib/generator-xos/app/templates/gulpfile.js b/views/gui/ngXosLib/generator-xos/app/templates/gulpfile.js
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/gulpfile.js
rename to views/gui/ngXosLib/generator-xos/app/templates/gulpfile.js
diff --git a/gui/ngXosLib/generator-xos/app/templates/karma.conf.js b/views/gui/ngXosLib/generator-xos/app/templates/karma.conf.js
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/karma.conf.js
rename to views/gui/ngXosLib/generator-xos/app/templates/karma.conf.js
diff --git a/gui/ngXosLib/generator-xos/app/templates/package.json b/views/gui/ngXosLib/generator-xos/app/templates/package.json
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/package.json
rename to views/gui/ngXosLib/generator-xos/app/templates/package.json
diff --git a/gui/ngXosLib/generator-xos/app/templates/spec/sample.test.js b/views/gui/ngXosLib/generator-xos/app/templates/spec/sample.test.js
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/spec/sample.test.js
rename to views/gui/ngXosLib/generator-xos/app/templates/spec/sample.test.js
diff --git a/gui/ngXosLib/generator-xos/app/templates/src/css/dev.css b/views/gui/ngXosLib/generator-xos/app/templates/src/css/dev.css
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/src/css/dev.css
rename to views/gui/ngXosLib/generator-xos/app/templates/src/css/dev.css
diff --git a/gui/ngXosLib/generator-xos/app/templates/src/index.html b/views/gui/ngXosLib/generator-xos/app/templates/src/index.html
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/src/index.html
rename to views/gui/ngXosLib/generator-xos/app/templates/src/index.html
diff --git a/gui/ngXosLib/generator-xos/app/templates/src/js/main.js b/views/gui/ngXosLib/generator-xos/app/templates/src/js/main.js
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/src/js/main.js
rename to views/gui/ngXosLib/generator-xos/app/templates/src/js/main.js
diff --git a/gui/ngXosLib/generator-xos/app/templates/src/templates/users-list.tpl.html b/views/gui/ngXosLib/generator-xos/app/templates/src/templates/users-list.tpl.html
similarity index 100%
rename from gui/ngXosLib/generator-xos/app/templates/src/templates/users-list.tpl.html
rename to views/gui/ngXosLib/generator-xos/app/templates/src/templates/users-list.tpl.html
diff --git a/gui/ngXosLib/generator-xos/package.json b/views/gui/ngXosLib/generator-xos/package.json
similarity index 100%
rename from gui/ngXosLib/generator-xos/package.json
rename to views/gui/ngXosLib/generator-xos/package.json
diff --git a/gui/ngXosLib/gulp/ngXosHelpers.js b/views/gui/ngXosLib/gulp/ngXosHelpers.js
similarity index 100%
rename from gui/ngXosLib/gulp/ngXosHelpers.js
rename to views/gui/ngXosLib/gulp/ngXosHelpers.js
diff --git a/gui/ngXosLib/gulp/ngXosVendor.js b/views/gui/ngXosLib/gulp/ngXosVendor.js
similarity index 100%
rename from gui/ngXosLib/gulp/ngXosVendor.js
rename to views/gui/ngXosLib/gulp/ngXosVendor.js
diff --git a/gui/ngXosLib/gulpfile.js b/views/gui/ngXosLib/gulpfile.js
similarity index 100%
rename from gui/ngXosLib/gulpfile.js
rename to views/gui/ngXosLib/gulpfile.js
diff --git a/gui/ngXosLib/karma.conf.js b/views/gui/ngXosLib/karma.conf.js
similarity index 100%
rename from gui/ngXosLib/karma.conf.js
rename to views/gui/ngXosLib/karma.conf.js
diff --git a/gui/ngXosLib/package.json b/views/gui/ngXosLib/package.json
similarity index 100%
rename from gui/ngXosLib/package.json
rename to views/gui/ngXosLib/package.json
diff --git a/gui/ngXosLib/xos-resource-generator.js b/views/gui/ngXosLib/xos-resource-generator.js
similarity index 100%
rename from gui/ngXosLib/xos-resource-generator.js
rename to views/gui/ngXosLib/xos-resource-generator.js
diff --git a/gui/ngXosLib/xos-swagger-def.js b/views/gui/ngXosLib/xos-swagger-def.js
similarity index 100%
rename from gui/ngXosLib/xos-swagger-def.js
rename to views/gui/ngXosLib/xos-swagger-def.js
diff --git a/gui/ngXosLib/xosHelpers/spec/csrftoken.test.js b/views/gui/ngXosLib/xosHelpers/spec/csrftoken.test.js
similarity index 100%
rename from gui/ngXosLib/xosHelpers/spec/csrftoken.test.js
rename to views/gui/ngXosLib/xosHelpers/spec/csrftoken.test.js
diff --git a/gui/ngXosLib/xosHelpers/src/services/api.services.js b/views/gui/ngXosLib/xosHelpers/src/services/api.services.js
similarity index 100%
rename from gui/ngXosLib/xosHelpers/src/services/api.services.js
rename to views/gui/ngXosLib/xosHelpers/src/services/api.services.js
diff --git a/gui/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js b/views/gui/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js
similarity index 100%
rename from gui/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js
rename to views/gui/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js
diff --git a/gui/ngXosLib/xosHelpers/src/services/noHyperlinks.interceptor.js b/views/gui/ngXosLib/xosHelpers/src/services/noHyperlinks.interceptor.js
similarity index 100%
rename from gui/ngXosLib/xosHelpers/src/services/noHyperlinks.interceptor.js
rename to views/gui/ngXosLib/xosHelpers/src/services/noHyperlinks.interceptor.js
diff --git a/gui/ngXosLib/xosHelpers/src/xosHelpers.module.js b/views/gui/ngXosLib/xosHelpers/src/xosHelpers.module.js
similarity index 100%
rename from gui/ngXosLib/xosHelpers/src/xosHelpers.module.js
rename to views/gui/ngXosLib/xosHelpers/src/xosHelpers.module.js
diff --git a/gui/ngXosViews/.gitignore b/views/gui/ngXosViews/.gitignore
similarity index 100%
rename from gui/ngXosViews/.gitignore
rename to views/gui/ngXosViews/.gitignore
diff --git a/gui/ngXosViews/ceilometerDashboard/.bowerrc b/views/gui/ngXosViews/ceilometerDashboard/.bowerrc
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/.bowerrc
rename to views/gui/ngXosViews/ceilometerDashboard/.bowerrc
diff --git a/gui/ngXosViews/ceilometerDashboard/.eslintrc b/views/gui/ngXosViews/ceilometerDashboard/.eslintrc
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/.eslintrc
rename to views/gui/ngXosViews/ceilometerDashboard/.eslintrc
diff --git a/gui/ngXosViews/ceilometerDashboard/.gitignore b/views/gui/ngXosViews/ceilometerDashboard/.gitignore
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/.gitignore
rename to views/gui/ngXosViews/ceilometerDashboard/.gitignore
diff --git a/gui/ngXosViews/ceilometerDashboard/bower.json b/views/gui/ngXosViews/ceilometerDashboard/bower.json
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/bower.json
rename to views/gui/ngXosViews/ceilometerDashboard/bower.json
diff --git a/gui/ngXosViews/ceilometerDashboard/env/default.js b/views/gui/ngXosViews/ceilometerDashboard/env/default.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/env/default.js
rename to views/gui/ngXosViews/ceilometerDashboard/env/default.js
diff --git a/gui/ngXosViews/ceilometerDashboard/env/srikanth.js b/views/gui/ngXosViews/ceilometerDashboard/env/srikanth.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/env/srikanth.js
rename to views/gui/ngXosViews/ceilometerDashboard/env/srikanth.js
diff --git a/gui/ngXosViews/ceilometerDashboard/gulp/build.js b/views/gui/ngXosViews/ceilometerDashboard/gulp/build.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/gulp/build.js
rename to views/gui/ngXosViews/ceilometerDashboard/gulp/build.js
diff --git a/gui/ngXosViews/ceilometerDashboard/gulp/server.js b/views/gui/ngXosViews/ceilometerDashboard/gulp/server.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/gulp/server.js
rename to views/gui/ngXosViews/ceilometerDashboard/gulp/server.js
diff --git a/gui/ngXosViews/ceilometerDashboard/gulpfile.js b/views/gui/ngXosViews/ceilometerDashboard/gulpfile.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/gulpfile.js
rename to views/gui/ngXosViews/ceilometerDashboard/gulpfile.js
diff --git a/gui/ngXosViews/ceilometerDashboard/karma.conf.js b/views/gui/ngXosViews/ceilometerDashboard/karma.conf.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/karma.conf.js
rename to views/gui/ngXosViews/ceilometerDashboard/karma.conf.js
diff --git a/gui/ngXosViews/ceilometerDashboard/package.json b/views/gui/ngXosViews/ceilometerDashboard/package.json
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/package.json
rename to views/gui/ngXosViews/ceilometerDashboard/package.json
diff --git a/gui/ngXosViews/ceilometerDashboard/spec/.eslintrc b/views/gui/ngXosViews/ceilometerDashboard/spec/.eslintrc
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/spec/.eslintrc
rename to views/gui/ngXosViews/ceilometerDashboard/spec/.eslintrc
diff --git a/gui/ngXosViews/ceilometerDashboard/spec/backend.mock.js b/views/gui/ngXosViews/ceilometerDashboard/spec/backend.mock.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/spec/backend.mock.js
rename to views/gui/ngXosViews/ceilometerDashboard/spec/backend.mock.js
diff --git a/gui/ngXosViews/ceilometerDashboard/spec/ceilometer.test.js b/views/gui/ngXosViews/ceilometerDashboard/spec/ceilometer.test.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/spec/ceilometer.test.js
rename to views/gui/ngXosViews/ceilometerDashboard/spec/ceilometer.test.js
diff --git a/gui/ngXosViews/ceilometerDashboard/src/css/ceilometerDashboard.css b/views/gui/ngXosViews/ceilometerDashboard/src/css/ceilometerDashboard.css
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/css/ceilometerDashboard.css
rename to views/gui/ngXosViews/ceilometerDashboard/src/css/ceilometerDashboard.css
diff --git a/gui/ngXosViews/ceilometerDashboard/src/css/dev.css b/views/gui/ngXosViews/ceilometerDashboard/src/css/dev.css
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/css/dev.css
rename to views/gui/ngXosViews/ceilometerDashboard/src/css/dev.css
diff --git a/gui/ngXosViews/ceilometerDashboard/src/index.html b/views/gui/ngXosViews/ceilometerDashboard/src/index.html
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/index.html
rename to views/gui/ngXosViews/ceilometerDashboard/src/index.html
diff --git a/gui/ngXosViews/ceilometerDashboard/src/js/main.js b/views/gui/ngXosViews/ceilometerDashboard/src/js/main.js
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/js/main.js
rename to views/gui/ngXosViews/ceilometerDashboard/src/js/main.js
diff --git a/gui/ngXosViews/ceilometerDashboard/src/meters_mock.json b/views/gui/ngXosViews/ceilometerDashboard/src/meters_mock.json
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/meters_mock.json
rename to views/gui/ngXosViews/ceilometerDashboard/src/meters_mock.json
diff --git a/gui/ngXosViews/ceilometerDashboard/src/stats_mock.json b/views/gui/ngXosViews/ceilometerDashboard/src/stats_mock.json
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/stats_mock.json
rename to views/gui/ngXosViews/ceilometerDashboard/src/stats_mock.json
diff --git a/gui/ngXosViews/ceilometerDashboard/src/templates/accordion-group.html b/views/gui/ngXosViews/ceilometerDashboard/src/templates/accordion-group.html
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/templates/accordion-group.html
rename to views/gui/ngXosViews/ceilometerDashboard/src/templates/accordion-group.html
diff --git a/gui/ngXosViews/ceilometerDashboard/src/templates/accordion.html b/views/gui/ngXosViews/ceilometerDashboard/src/templates/accordion.html
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/templates/accordion.html
rename to views/gui/ngXosViews/ceilometerDashboard/src/templates/accordion.html
diff --git a/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-dashboard.tpl.html b/views/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-dashboard.tpl.html
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-dashboard.tpl.html
rename to views/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-dashboard.tpl.html
diff --git a/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-samples.tpl.html b/views/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-samples.tpl.html
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-samples.tpl.html
rename to views/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-samples.tpl.html
diff --git a/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-stats.tpl.html b/views/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-stats.tpl.html
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-stats.tpl.html
rename to views/gui/ngXosViews/ceilometerDashboard/src/templates/ceilometer-stats.tpl.html
diff --git a/gui/ngXosViews/ceilometerDashboard/teone@clnode015.clemson.cloudlab.us b/views/gui/ngXosViews/ceilometerDashboard/teone@clnode015.clemson.cloudlab.us
similarity index 100%
rename from gui/ngXosViews/ceilometerDashboard/teone@clnode015.clemson.cloudlab.us
rename to views/gui/ngXosViews/ceilometerDashboard/teone@clnode015.clemson.cloudlab.us
diff --git a/gui/ngXosViews/contentProvider/.bowerrc b/views/gui/ngXosViews/contentProvider/.bowerrc
similarity index 100%
rename from gui/ngXosViews/contentProvider/.bowerrc
rename to views/gui/ngXosViews/contentProvider/.bowerrc
diff --git a/gui/ngXosViews/contentProvider/.eslintrc b/views/gui/ngXosViews/contentProvider/.eslintrc
similarity index 100%
rename from gui/ngXosViews/contentProvider/.eslintrc
rename to views/gui/ngXosViews/contentProvider/.eslintrc
diff --git a/gui/ngXosViews/contentProvider/.gitignore b/views/gui/ngXosViews/contentProvider/.gitignore
similarity index 100%
rename from gui/ngXosViews/contentProvider/.gitignore
rename to views/gui/ngXosViews/contentProvider/.gitignore
diff --git a/gui/ngXosViews/contentProvider/bower.json b/views/gui/ngXosViews/contentProvider/bower.json
similarity index 100%
rename from gui/ngXosViews/contentProvider/bower.json
rename to views/gui/ngXosViews/contentProvider/bower.json
diff --git a/gui/ngXosViews/contentProvider/gulp/build.js b/views/gui/ngXosViews/contentProvider/gulp/build.js
similarity index 100%
rename from gui/ngXosViews/contentProvider/gulp/build.js
rename to views/gui/ngXosViews/contentProvider/gulp/build.js
diff --git a/gui/ngXosViews/contentProvider/gulp/server.js b/views/gui/ngXosViews/contentProvider/gulp/server.js
similarity index 100%
rename from gui/ngXosViews/contentProvider/gulp/server.js
rename to views/gui/ngXosViews/contentProvider/gulp/server.js
diff --git a/gui/ngXosViews/contentProvider/gulpfile.js b/views/gui/ngXosViews/contentProvider/gulpfile.js
similarity index 100%
rename from gui/ngXosViews/contentProvider/gulpfile.js
rename to views/gui/ngXosViews/contentProvider/gulpfile.js
diff --git a/gui/ngXosViews/contentProvider/karma.conf.js b/views/gui/ngXosViews/contentProvider/karma.conf.js
similarity index 100%
rename from gui/ngXosViews/contentProvider/karma.conf.js
rename to views/gui/ngXosViews/contentProvider/karma.conf.js
diff --git a/gui/ngXosViews/contentProvider/package.json b/views/gui/ngXosViews/contentProvider/package.json
similarity index 100%
rename from gui/ngXosViews/contentProvider/package.json
rename to views/gui/ngXosViews/contentProvider/package.json
diff --git a/gui/ngXosViews/contentProvider/spec/contentprovider.test.js b/views/gui/ngXosViews/contentProvider/spec/contentprovider.test.js
similarity index 100%
rename from gui/ngXosViews/contentProvider/spec/contentprovider.test.js
rename to views/gui/ngXosViews/contentProvider/spec/contentprovider.test.js
diff --git a/gui/ngXosViews/contentProvider/spec/mocks/contentProvider.mock.js b/views/gui/ngXosViews/contentProvider/spec/mocks/contentProvider.mock.js
similarity index 100%
rename from gui/ngXosViews/contentProvider/spec/mocks/contentProvider.mock.js
rename to views/gui/ngXosViews/contentProvider/spec/mocks/contentProvider.mock.js
diff --git a/gui/ngXosViews/contentProvider/spec/sample.test.js b/views/gui/ngXosViews/contentProvider/spec/sample.test.js
similarity index 100%
rename from gui/ngXosViews/contentProvider/spec/sample.test.js
rename to views/gui/ngXosViews/contentProvider/spec/sample.test.js
diff --git a/gui/ngXosViews/contentProvider/src/css/dev.css b/views/gui/ngXosViews/contentProvider/src/css/dev.css
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/css/dev.css
rename to views/gui/ngXosViews/contentProvider/src/css/dev.css
diff --git a/gui/ngXosViews/contentProvider/src/index.html b/views/gui/ngXosViews/contentProvider/src/index.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/index.html
rename to views/gui/ngXosViews/contentProvider/src/index.html
diff --git a/gui/ngXosViews/contentProvider/src/js/main.js b/views/gui/ngXosViews/contentProvider/src/js/main.js
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/js/main.js
rename to views/gui/ngXosViews/contentProvider/src/js/main.js
diff --git a/gui/ngXosViews/contentProvider/src/templates/cp_actions.html b/views/gui/ngXosViews/contentProvider/src/templates/cp_actions.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/templates/cp_actions.html
rename to views/gui/ngXosViews/contentProvider/src/templates/cp_actions.html
diff --git a/gui/ngXosViews/contentProvider/src/templates/cp_cdn_prefix.html b/views/gui/ngXosViews/contentProvider/src/templates/cp_cdn_prefix.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/templates/cp_cdn_prefix.html
rename to views/gui/ngXosViews/contentProvider/src/templates/cp_cdn_prefix.html
diff --git a/gui/ngXosViews/contentProvider/src/templates/cp_detail.html b/views/gui/ngXosViews/contentProvider/src/templates/cp_detail.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/templates/cp_detail.html
rename to views/gui/ngXosViews/contentProvider/src/templates/cp_detail.html
diff --git a/gui/ngXosViews/contentProvider/src/templates/cp_list.html b/views/gui/ngXosViews/contentProvider/src/templates/cp_list.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/templates/cp_list.html
rename to views/gui/ngXosViews/contentProvider/src/templates/cp_list.html
diff --git a/gui/ngXosViews/contentProvider/src/templates/cp_origin_server.html b/views/gui/ngXosViews/contentProvider/src/templates/cp_origin_server.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/templates/cp_origin_server.html
rename to views/gui/ngXosViews/contentProvider/src/templates/cp_origin_server.html
diff --git a/gui/ngXosViews/contentProvider/src/templates/cp_side_nav.html b/views/gui/ngXosViews/contentProvider/src/templates/cp_side_nav.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/templates/cp_side_nav.html
rename to views/gui/ngXosViews/contentProvider/src/templates/cp_side_nav.html
diff --git a/gui/ngXosViews/contentProvider/src/templates/cp_user.html b/views/gui/ngXosViews/contentProvider/src/templates/cp_user.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/templates/cp_user.html
rename to views/gui/ngXosViews/contentProvider/src/templates/cp_user.html
diff --git a/gui/ngXosViews/contentProvider/src/templates/users-list.tpl.html b/views/gui/ngXosViews/contentProvider/src/templates/users-list.tpl.html
similarity index 100%
rename from gui/ngXosViews/contentProvider/src/templates/users-list.tpl.html
rename to views/gui/ngXosViews/contentProvider/src/templates/users-list.tpl.html
diff --git a/gui/ngXosViews/serviceTopology/.bowerrc b/views/gui/ngXosViews/serviceTopology/.bowerrc
similarity index 100%
rename from gui/ngXosViews/serviceTopology/.bowerrc
rename to views/gui/ngXosViews/serviceTopology/.bowerrc
diff --git a/gui/ngXosViews/serviceTopology/.eslintrc b/views/gui/ngXosViews/serviceTopology/.eslintrc
similarity index 100%
rename from gui/ngXosViews/serviceTopology/.eslintrc
rename to views/gui/ngXosViews/serviceTopology/.eslintrc
diff --git a/gui/ngXosViews/serviceTopology/.gitignore b/views/gui/ngXosViews/serviceTopology/.gitignore
similarity index 100%
rename from gui/ngXosViews/serviceTopology/.gitignore
rename to views/gui/ngXosViews/serviceTopology/.gitignore
diff --git a/gui/ngXosViews/serviceTopology/bower.json b/views/gui/ngXosViews/serviceTopology/bower.json
similarity index 100%
rename from gui/ngXosViews/serviceTopology/bower.json
rename to views/gui/ngXosViews/serviceTopology/bower.json
diff --git a/gui/ngXosViews/serviceTopology/env/apt.js b/views/gui/ngXosViews/serviceTopology/env/apt.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/env/apt.js
rename to views/gui/ngXosViews/serviceTopology/env/apt.js
diff --git a/gui/ngXosViews/serviceTopology/env/default.js b/views/gui/ngXosViews/serviceTopology/env/default.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/env/default.js
rename to views/gui/ngXosViews/serviceTopology/env/default.js
diff --git a/gui/ngXosViews/serviceTopology/env/srikanth.js b/views/gui/ngXosViews/serviceTopology/env/srikanth.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/env/srikanth.js
rename to views/gui/ngXosViews/serviceTopology/env/srikanth.js
diff --git a/gui/ngXosViews/serviceTopology/gulp/build.js b/views/gui/ngXosViews/serviceTopology/gulp/build.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/gulp/build.js
rename to views/gui/ngXosViews/serviceTopology/gulp/build.js
diff --git a/gui/ngXosViews/serviceTopology/gulp/server.js b/views/gui/ngXosViews/serviceTopology/gulp/server.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/gulp/server.js
rename to views/gui/ngXosViews/serviceTopology/gulp/server.js
diff --git a/gui/ngXosViews/serviceTopology/gulpfile.js b/views/gui/ngXosViews/serviceTopology/gulpfile.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/gulpfile.js
rename to views/gui/ngXosViews/serviceTopology/gulpfile.js
diff --git a/gui/ngXosViews/serviceTopology/karma.conf.js b/views/gui/ngXosViews/serviceTopology/karma.conf.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/karma.conf.js
rename to views/gui/ngXosViews/serviceTopology/karma.conf.js
diff --git a/gui/ngXosViews/serviceTopology/package.json b/views/gui/ngXosViews/serviceTopology/package.json
similarity index 100%
rename from gui/ngXosViews/serviceTopology/package.json
rename to views/gui/ngXosViews/serviceTopology/package.json
diff --git a/gui/ngXosViews/serviceTopology/spec/sample.test.js b/views/gui/ngXosViews/serviceTopology/spec/sample.test.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/spec/sample.test.js
rename to views/gui/ngXosViews/serviceTopology/spec/sample.test.js
diff --git a/gui/ngXosViews/serviceTopology/src/css/dev.css b/views/gui/ngXosViews/serviceTopology/src/css/dev.css
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/css/dev.css
rename to views/gui/ngXosViews/serviceTopology/src/css/dev.css
diff --git a/gui/ngXosViews/serviceTopology/src/css/serviceTopology.css b/views/gui/ngXosViews/serviceTopology/src/css/serviceTopology.css
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/css/serviceTopology.css
rename to views/gui/ngXosViews/serviceTopology/src/css/serviceTopology.css
diff --git a/gui/ngXosViews/serviceTopology/src/index.html b/views/gui/ngXosViews/serviceTopology/src/index.html
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/index.html
rename to views/gui/ngXosViews/serviceTopology/src/index.html
diff --git a/gui/ngXosViews/serviceTopology/src/js/config.js b/views/gui/ngXosViews/serviceTopology/src/js/config.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/js/config.js
rename to views/gui/ngXosViews/serviceTopology/src/js/config.js
diff --git a/gui/ngXosViews/serviceTopology/src/js/d3.js b/views/gui/ngXosViews/serviceTopology/src/js/d3.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/js/d3.js
rename to views/gui/ngXosViews/serviceTopology/src/js/d3.js
diff --git a/gui/ngXosViews/serviceTopology/src/js/main.js b/views/gui/ngXosViews/serviceTopology/src/js/main.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/js/main.js
rename to views/gui/ngXosViews/serviceTopology/src/js/main.js
diff --git a/gui/ngXosViews/serviceTopology/src/js/services.js b/views/gui/ngXosViews/serviceTopology/src/js/services.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/js/services.js
rename to views/gui/ngXosViews/serviceTopology/src/js/services.js
diff --git a/gui/ngXosViews/serviceTopology/src/js/topologyCanvas.js b/views/gui/ngXosViews/serviceTopology/src/js/topologyCanvas.js
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/js/topologyCanvas.js
rename to views/gui/ngXosViews/serviceTopology/src/js/topologyCanvas.js
diff --git a/gui/ngXosViews/serviceTopology/src/templates/topology_canvas.tpl.html b/views/gui/ngXosViews/serviceTopology/src/templates/topology_canvas.tpl.html
similarity index 100%
rename from gui/ngXosViews/serviceTopology/src/templates/topology_canvas.tpl.html
rename to views/gui/ngXosViews/serviceTopology/src/templates/topology_canvas.tpl.html