diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 0d2ae6fe8..dea280212 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -50,8 +50,8 @@
 </template>
 
 <script>
-import AddAddress from '../_components/AddAddress.vue';
-import ShowAddress from '../_components/ShowAddress.vue';
+import AddAddress from './components/AddAddress.vue';
+import ShowAddress from './components/ShowAddress.vue';
 
 export default {
    name: 'App',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
similarity index 99%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index e2222fa8f..48100c584 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -87,8 +87,9 @@
 </template>
 
 <script>
-import Modal from './Modal';
-import { fetchCountries, fetchCities, fetchReferenceAddresses } from '../_api/AddAddress'
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+import { fetchCountries, fetchCities, fetchReferenceAddresses } from '../api'
+
 import CountrySelection from './AddAddress/CountrySelection';
 import CitySelection from './AddAddress/CitySelection';
 import AddressSelection from './AddAddress/AddressSelection';
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
index 249b0ce4a..967675c8f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
@@ -1,7 +1,7 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
 
-import { patchAddress, postAddress, postPostalCode, postAddressToPerson, getAddress } from '../../_api/AddAddress'
+import { patchAddress, postAddress, postPostalCode, postAddressToPerson, getAddress } from '../api'
 
 const debug = process.env.NODE_ENV !== 'production';
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 0980f25a5..5db0a10eb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -336,7 +336,7 @@ import ClassicEditor from 'ChillMainAssets/modules/ckeditor5/index.js';
 import AddResult from './_components/AddResult.vue';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 const i18n = {
   messages: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
index 626b62337..0cf3a67c8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
@@ -56,8 +56,8 @@
 
 <script>
 
-import AddAddress from 'ChillMainAssets/vuejs/_components/AddAddress.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/ShowAddress.vue';
+import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 export default {
    name: 'App',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js
index 7127ce60c..9a3e4b866 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js
@@ -1,7 +1,7 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
 
-import { postAddress, postPostalCode, patchAddress, getAddress } from 'ChillMainAssets/vuejs/_api/AddAddress';
+import { postAddress, postPostalCode, patchAddress, getAddress } from 'ChillMainAssets/vuejs/Address/api';
 import { postAddressToHousehold } from '../api';
 
 const debug = process.env.NODE_ENV !== 'production';
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
index 1f9ef99c5..e683daed4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
@@ -76,7 +76,7 @@
 <script>
 
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 const i18n = {
   "messages":