diff --git a/src/router/routes.ts b/src/router/routes.ts
index 217ce8b..a033b45 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -2,27 +2,27 @@ import { RouteConfig } from 'vue-router';
 
 const routes: RouteConfig[] = [
   { path: '/', component: () => import('@/pages/Index.vue'), meta: { name: 'Home' } },
-  { path: '/signup', component: () => import('@/components/views/login/signup.vue'), meta: { name: 'Registration' } },
-  { path: '/signin', component: () => import('@/components/views/login/signin.vue'), meta: { name: 'Login' } },
-  { path: '/vreg', component: () => import('@/components/views/login/vreg.vue'), meta: { name: 'Verify Reg' } },
+  { path: '/signup', component: () => import('@/views/login/signup.vue'), meta: { name: 'Registration' } },
+  { path: '/signin', component: () => import('@/views/login/signin.vue'), meta: { name: 'Login' } },
+  { path: '/vreg', component: () => import('@/views/login/vreg.vue'), meta: { name: 'Verify Reg' } },
   {
     path: '/requestresetpwd',
-    component: () => import('@/components/views/login/requestresetpwd.vue'),
+    component: () => import('@/views/login/requestresetpwd.vue'),
     meta: { name: 'Reset your Password' }
   },
   {
     path: '/updatepwd',
-    component: () => import('@/components/views/login/updatepassword.vue'),
+    component: () => import('@/views/login/updatepassword.vue'),
     meta: { name: 'Update your Password' }
   },
   {
     path: '/simpleform',
-    component: () => import('@/components/views/form/simpleForm/simpleForm.vue'),
+    component: () => import('@/views/form/simpleForm/simpleForm.vue'),
     meta: { name: 'SimpleForm' }
   },
   {
     path: '/embeeded',
-    component: () => import('@/components/views/form/embeeded/embeeded.vue'),
+    component: () => import('@/views/form/embeeded/embeeded.vue'),
     meta: { name: 'Embeeded' }
   },
 ];
diff --git a/src/components/views/Auth.vue b/src/views/Auth.vue
similarity index 100%
rename from src/components/views/Auth.vue
rename to src/views/Auth.vue
diff --git a/src/components/views/AuthSuccess.vue b/src/views/AuthSuccess.vue
similarity index 100%
rename from src/components/views/AuthSuccess.vue
rename to src/views/AuthSuccess.vue
diff --git a/src/components/views/Error404.vue b/src/views/Error404.vue
similarity index 100%
rename from src/components/views/Error404.vue
rename to src/views/Error404.vue
diff --git a/src/components/views/dashboard/one/cardChart.vue b/src/views/dashboard/one/cardChart.vue
similarity index 100%
rename from src/components/views/dashboard/one/cardChart.vue
rename to src/views/dashboard/one/cardChart.vue
diff --git a/src/components/views/dashboard/one/cardTodo.vue b/src/views/dashboard/one/cardTodo.vue
similarity index 100%
rename from src/components/views/dashboard/one/cardTodo.vue
rename to src/views/dashboard/one/cardTodo.vue
diff --git a/src/components/views/dashboard/one/cardTotal.vue b/src/views/dashboard/one/cardTotal.vue
similarity index 100%
rename from src/components/views/dashboard/one/cardTotal.vue
rename to src/views/dashboard/one/cardTotal.vue
diff --git a/src/components/views/dashboard/one/dashboard.vue b/src/views/dashboard/one/dashboard.vue
similarity index 97%
rename from src/components/views/dashboard/one/dashboard.vue
rename to src/views/dashboard/one/dashboard.vue
index 84c1ec5..f547a3f 100644
--- a/src/components/views/dashboard/one/dashboard.vue
+++ b/src/views/dashboard/one/dashboard.vue
@@ -56,7 +56,7 @@
   import cardTodo from './cardTodo.vue'
   import knobStatistics from './knobStatistics.vue'
   import { mapActions } from 'vuex'
-  import * as types from '../../../../store/mutation-types'
+  import * as types from '../../../store/mutation-types'
   export default {
     name: 'Home',
     mounted () {
diff --git a/src/components/views/dashboard/one/knobStatistics.vue b/src/views/dashboard/one/knobStatistics.vue
similarity index 100%
rename from src/components/views/dashboard/one/knobStatistics.vue
rename to src/views/dashboard/one/knobStatistics.vue
diff --git a/src/components/views/dashboard/one/tagKnob.vue b/src/views/dashboard/one/tagKnob.vue
similarity index 100%
rename from src/components/views/dashboard/one/tagKnob.vue
rename to src/views/dashboard/one/tagKnob.vue
diff --git a/src/components/views/form/_examples/advancedFormOne/advancedFormOne.vue b/src/views/form/_examples/advancedFormOne/advancedFormOne.vue
similarity index 100%
rename from src/components/views/form/_examples/advancedFormOne/advancedFormOne.vue
rename to src/views/form/_examples/advancedFormOne/advancedFormOne.vue
diff --git a/src/components/views/form/_examples/advancedFormOne/cardUserData.vue b/src/views/form/_examples/advancedFormOne/cardUserData.vue
similarity index 100%
rename from src/components/views/form/_examples/advancedFormOne/cardUserData.vue
rename to src/views/form/_examples/advancedFormOne/cardUserData.vue
diff --git a/src/components/views/form/embeeded/eDateTime.vue b/src/views/form/embeeded/eDateTime.vue
similarity index 100%
rename from src/components/views/form/embeeded/eDateTime.vue
rename to src/views/form/embeeded/eDateTime.vue
diff --git a/src/components/views/form/embeeded/eInput.vue b/src/views/form/embeeded/eInput.vue
similarity index 100%
rename from src/components/views/form/embeeded/eInput.vue
rename to src/views/form/embeeded/eInput.vue
diff --git a/src/components/views/form/embeeded/eSelect.vue b/src/views/form/embeeded/eSelect.vue
similarity index 100%
rename from src/components/views/form/embeeded/eSelect.vue
rename to src/views/form/embeeded/eSelect.vue
diff --git a/src/components/views/form/embeeded/embeeded.vue b/src/views/form/embeeded/embeeded.vue
similarity index 100%
rename from src/components/views/form/embeeded/embeeded.vue
rename to src/views/form/embeeded/embeeded.vue
diff --git a/src/components/views/form/simpleForm/modalAdress.vue b/src/views/form/simpleForm/modalAdress.vue
similarity index 100%
rename from src/components/views/form/simpleForm/modalAdress.vue
rename to src/views/form/simpleForm/modalAdress.vue
diff --git a/src/components/views/form/simpleForm/simpleForm.vue b/src/views/form/simpleForm/simpleForm.vue
similarity index 100%
rename from src/components/views/form/simpleForm/simpleForm.vue
rename to src/views/form/simpleForm/simpleForm.vue
diff --git a/src/components/views/form/simpleForm/userForm.vue b/src/views/form/simpleForm/userForm.vue
similarity index 100%
rename from src/components/views/form/simpleForm/userForm.vue
rename to src/views/form/simpleForm/userForm.vue
diff --git a/src/components/views/login/login.vue b/src/views/login/login.vue
similarity index 98%
rename from src/components/views/login/login.vue
rename to src/views/login/login.vue
index 546e88b..978ff8e 100644
--- a/src/components/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -32,7 +32,7 @@
 <script type="text/javascript">
   /* eslint-disable */
   import {mapActions} from 'vuex'
-  import * as types from '../../../store/mutation-types'
+  import * as types from '../../store/mutation-types'
   import Vivus from 'vivus'
   import logoData from './logoData'
   import { Platform } from 'quasar'
diff --git a/src/components/views/login/logoData.js b/src/views/login/logoData.js
similarity index 100%
rename from src/components/views/login/logoData.js
rename to src/views/login/logoData.js
diff --git a/src/components/views/login/requestresetpwd.vue b/src/views/login/requestresetpwd.vue
similarity index 93%
rename from src/components/views/login/requestresetpwd.vue
rename to src/views/login/requestresetpwd.vue
index 4c1c1af..265b02f 100644
--- a/src/components/views/login/requestresetpwd.vue
+++ b/src/views/login/requestresetpwd.vue
@@ -49,10 +49,10 @@
 <script>
 
   import {mapActions} from 'vuex'
-  import * as types from '../../../store/mutation-types'
-  import {Errori_MongoDb} from '../../../store/modules/user'
+  import * as types from '../../store/mutation-types'
+  import {Errori_MongoDb} from '../../store/modules/user'
 
-  import {serv_constants} from '../../../store/modules/serv_constants';
+  import {serv_constants} from '../../store/modules/serv_constants';
 
 
   export default {
diff --git a/src/components/views/login/signin.vue b/src/views/login/signin.vue
similarity index 96%
rename from src/components/views/login/signin.vue
rename to src/views/login/signin.vue
index fc122d3..1c70e67 100644
--- a/src/components/views/login/signin.vue
+++ b/src/views/login/signin.vue
@@ -62,10 +62,10 @@
   } from 'vuelidate/lib/validators'
 
   import {mapGetters, mapActions} from 'vuex'
-  import * as types from '../../../store/mutation-types'
+  import * as types from '../../store/mutation-types'
 
-  import {Errori_MongoDb} from '../../../store/modules/user'
-  import {serv_constants} from "../../../store/modules/serv_constants";
+  import {Errori_MongoDb} from '../../store/modules/user'
+  import {serv_constants} from "../../store/modules/serv_constants";
   import axios from 'axios';
 
   import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
diff --git a/src/components/views/login/signup.vue b/src/views/login/signup.vue
similarity index 98%
rename from src/components/views/login/signup.vue
rename to src/views/login/signup.vue
index 4a0609e..d6f5cc1 100644
--- a/src/components/views/login/signup.vue
+++ b/src/views/login/signup.vue
@@ -110,9 +110,9 @@
   import { validationMixin } from 'vuelidate';
 
   import { mapGetters, mapActions } from 'vuex'
-  import * as types from '../../../store/mutation-types'
+  import * as types from '../../store/mutation-types'
 
-  import { Errori_MongoDb } from '../../../store/modules/user'
+  import { Errori_MongoDb } from '../../store/modules/user'
   import axios from 'axios';
 
   import { Loading, QSpinnerFacebook, QSpinnerGears } from 'quasar'
@@ -120,36 +120,6 @@
 
   @Component({
     mixins: [validationMixin],
-    data () {
-      return {
-        url: process.env.VUE_APP_URL,
-        form: {
-          email: process.env.TEST_EMAIL,
-          username: process.env.TEST_USERNAME,
-          password: process.env.TEST_PASSWORD,
-          repeatPassword: process.env.TEST_PASSWORD,
-          dateOfBirth: '',
-          terms: true,
-        },
-        duplicate_email: false,
-        duplicate_username: false,
-      }
-    },
-    computed: {
-      ...mapGetters("user", [
-        'getUsername',
-        'getPassword',
-        'getEmail',
-        'getDateOfBirth',
-      ]),
-      ...mapGetters("user", [
-        'getUserServer',
-        'getServerCode',
-      ]),
-      env () {
-        return env
-      },
-    },
     validations: {
       isAsync: true,
       form: {
@@ -185,6 +155,36 @@
 
       }
     },
+    data () {
+      return {
+        url: process.env.VUE_APP_URL,
+        form: {
+          email: process.env.TEST_EMAIL,
+          username: process.env.TEST_USERNAME,
+          password: process.env.TEST_PASSWORD,
+          repeatPassword: process.env.TEST_PASSWORD,
+          dateOfBirth: '',
+          terms: true,
+        },
+        duplicate_email: false,
+        duplicate_username: false,
+      }
+    },
+    computed: {
+      ...mapGetters("user", [
+        'getUsername',
+        'getPassword',
+        'getEmail',
+        'getDateOfBirth',
+      ]),
+      ...mapGetters("user", [
+        'getUserServer',
+        'getServerCode',
+      ]),
+      env () {
+        return env
+      },
+    },
     methods: {
       ...mapActions("user", {
         signup: types.USER_SIGNUP,
diff --git a/src/components/views/login/updatepassword.vue b/src/views/login/updatepassword.vue
similarity index 94%
rename from src/components/views/login/updatepassword.vue
rename to src/views/login/updatepassword.vue
index 749b9ff..2a5e588 100644
--- a/src/components/views/login/updatepassword.vue
+++ b/src/views/login/updatepassword.vue
@@ -59,10 +59,10 @@
 <script>
 
   import {mapActions} from 'vuex'
-  import * as types from '../../../store/mutation-types'
-  import {Errori_MongoDb} from '../../../store/modules/user'
+  import * as types from '../../store/mutation-types'
+  import {Errori_MongoDb} from '../../store/modules/user'
 
-  import {serv_constants} from '../../../store/modules/serv_constants';
+  import {serv_constants} from '../../store/modules/serv_constants';
 
 
   export default {
diff --git a/src/components/views/login/vreg.vue b/src/views/login/vreg.vue
similarity index 90%
rename from src/components/views/login/vreg.vue
rename to src/views/login/vreg.vue
index e5ead31..d65ad42 100644
--- a/src/components/views/login/vreg.vue
+++ b/src/views/login/vreg.vue
@@ -31,10 +31,10 @@
 <script>
 
   import {mapActions} from 'vuex'
-  import * as types from '../../../store/mutation-types'
-  import {Errori_MongoDb} from '../../../store/modules/user'
+  import * as types from '../../store/mutation-types'
+  import {Errori_MongoDb} from '../../store/modules/user'
 
-  import {serv_constants} from '../../../store/modules/serv_constants';
+  import {serv_constants} from '../../store/modules/serv_constants';
 
 
   export default {
diff --git a/src/components/views/pricing/cardPlanOne.vue b/src/views/pricing/cardPlanOne.vue
similarity index 100%
rename from src/components/views/pricing/cardPlanOne.vue
rename to src/views/pricing/cardPlanOne.vue
diff --git a/src/components/views/pricing/cardPlanTwo.vue b/src/views/pricing/cardPlanTwo.vue
similarity index 100%
rename from src/components/views/pricing/cardPlanTwo.vue
rename to src/views/pricing/cardPlanTwo.vue
diff --git a/src/components/views/pricing/plansBenefits/benefitFour.vue b/src/views/pricing/plansBenefits/benefitFour.vue
similarity index 100%
rename from src/components/views/pricing/plansBenefits/benefitFour.vue
rename to src/views/pricing/plansBenefits/benefitFour.vue
diff --git a/src/components/views/pricing/plansBenefits/benefitOne.vue b/src/views/pricing/plansBenefits/benefitOne.vue
similarity index 100%
rename from src/components/views/pricing/plansBenefits/benefitOne.vue
rename to src/views/pricing/plansBenefits/benefitOne.vue
diff --git a/src/components/views/pricing/plansBenefits/benefitThree.vue b/src/views/pricing/plansBenefits/benefitThree.vue
similarity index 100%
rename from src/components/views/pricing/plansBenefits/benefitThree.vue
rename to src/views/pricing/plansBenefits/benefitThree.vue
diff --git a/src/components/views/pricing/plansBenefits/benefitTwo.vue b/src/views/pricing/plansBenefits/benefitTwo.vue
similarity index 100%
rename from src/components/views/pricing/plansBenefits/benefitTwo.vue
rename to src/views/pricing/plansBenefits/benefitTwo.vue
diff --git a/src/components/views/pricing/pricing.vue b/src/views/pricing/pricing.vue
similarity index 100%
rename from src/components/views/pricing/pricing.vue
rename to src/views/pricing/pricing.vue
diff --git a/src/components/views/test/pao.vue b/src/views/test/pao.vue
similarity index 100%
rename from src/components/views/test/pao.vue
rename to src/views/test/pao.vue