diff --git a/.gitignore b/.gitignore
index 7641967b6..3ee72d2c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@ last-js-build.md5
 last-sass-build.md5
 last-composer-build.md5
 last-package-build.md5
-src/front/scss/.sass-cache
+src/front/admin/scss/.sass-cache
 src/assets/css/tainacan-admin.css
 src/assets/css/tainacan-admin.css.map
 src/assets/report.html
diff --git a/build.sh b/build.sh
index eff7af622..e0ff9a823 100755
--- a/build.sh
+++ b/build.sh
@@ -13,12 +13,12 @@ current_OS=`uname`
 # For macOS (Darwin)
 if [ $current_OS == "Darwin" ]; then
     find src ./webpack.config.js -type f \( -name "*.js" -or -name "*.vue" -or -name "webpack.config.js" \) -exec md5 {} \; | sort -k 2 | md5 > last-js-build.md5
-    find ./src/scss/ ./src/front/scss/ ./src/front/gutenberg-blocks/ ./src/front/gutenberg-blocks/tainacan-collections/collections-list ./src/front/gutenberg-blocks/tainacan-facets/facets-list ./src/front/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/front/gutenberg-blocks/tainacan-items/items-list ./src/front/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5
+    find ./src/scss/ ./src/front/admin/scss/ ./src/front/gutenberg-blocks/ ./src/front/gutenberg-blocks/tainacan-collections/collections-list ./src/front/gutenberg-blocks/tainacan-facets/facets-list ./src/front/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/front/gutenberg-blocks/tainacan-items/items-list ./src/front/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5
     find ./composer.json -type f \( -name "composer.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-composer-build.md5
     find ./package.json -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-package-build.md5
 else
     find src ./webpack.config.js -type f \( -name "*.js" -or -name "*.vue" -or -name "webpack.config.js" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5
-    find ./src/scss/ ./src/front/scss/ ./src/front/gutenberg-blocks ./src/front/gutenberg-blocks/tainacan-collections/collections-list ./src/front/gutenberg-blocks/tainacan-facets/facets-list ./src/front/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/front/gutenberg-blocks/tainacan-items/items-list ./src/front/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5
+    find ./src/scss/ ./src/front/admin/scss/ ./src/front/gutenberg-blocks ./src/front/gutenberg-blocks/tainacan-collections/collections-list ./src/front/gutenberg-blocks/tainacan-facets/facets-list ./src/front/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/front/gutenberg-blocks/tainacan-items/items-list ./src/front/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5
     find ./composer.json -type f \( -name "composer.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-composer-build.md5
     find ./package.json -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-package-build.md5
 fi
diff --git a/compile-sass.sh b/compile-sass.sh
index 2515c2dd0..dea69d120 100644
--- a/compile-sass.sh
+++ b/compile-sass.sh
@@ -11,9 +11,9 @@ echo "Compilando Sass..."
 
 sass -E 'UTF-8' --cache-location .tmp/sass-cache-1 src/scss/tainacan-embeds.scss:src/assets/css/tainacan-embeds.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-2 src/front/scss/tainacan-admin.scss:src/assets/css/tainacan-admin.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-2 src/front/admin/scss/tainacan-admin.scss:src/assets/css/tainacan-admin.css
 
-sass -E 'UTF-8' --cache-location .tmp/sass-cache-3 src/front/scss/tainacan-roles.scss:src/assets/css/tainacan-roles.css
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-3 src/front/roles/tainacan-roles.scss:src/assets/css/tainacan-roles.css
 
 sass -E 'UTF-8' --cache-location .tmp/sass-cache-4 src/front/gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss:src/assets/css/tainacan-gutenberg-block-collections-list.css
 
diff --git a/src/classes/filter-types/checkbox/Checkbox.vue b/src/classes/filter-types/checkbox/Checkbox.vue
index 845fabea3..cb04cec3d 100644
--- a/src/classes/filter-types/checkbox/Checkbox.vue
+++ b/src/classes/filter-types/checkbox/Checkbox.vue
@@ -41,7 +41,7 @@
 <script>
     import { isCancel } from '../../../js/axios/axios';
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
-    import CheckboxRadioModal from '../../../front/components/other/checkbox-radio-modal.vue';
+    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue';
 
     export default {
         mixins: [filterTypeMixin, dynamicFilterTypeMixin],
diff --git a/src/classes/filter-types/date-interval/DateInterval.vue b/src/classes/filter-types/date-interval/DateInterval.vue
index 89d5e02b3..c0c43036a 100644
--- a/src/classes/filter-types/date-interval/DateInterval.vue
+++ b/src/classes/filter-types/date-interval/DateInterval.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-    import { wpAjax, dateInter } from "../../../front/js/mixins";
+    import { wpAjax, dateInter } from "../../../front/admin/js/mixins";
     import { filterTypeMixin } from '../filter-types-mixin';
     import moment from 'moment';
 
diff --git a/src/classes/filter-types/date/Date.vue b/src/classes/filter-types/date/Date.vue
index 5628e67f0..3707ae3b6 100644
--- a/src/classes/filter-types/date/Date.vue
+++ b/src/classes/filter-types/date/Date.vue
@@ -111,7 +111,7 @@
 </template>
 
 <script>
-    import { wpAjax, dateInter } from "../../../front/js/mixins";
+    import { wpAjax, dateInter } from "../../../front/admin/js/mixins";
     import { filterTypeMixin } from '../filter-types-mixin';
     import moment from 'moment';
 
diff --git a/src/classes/filter-types/numeric/Numeric.vue b/src/classes/filter-types/numeric/Numeric.vue
index 6a226a498..247765d7a 100644
--- a/src/classes/filter-types/numeric/Numeric.vue
+++ b/src/classes/filter-types/numeric/Numeric.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-    import { wpAjax } from '../../../front/js/mixins';
+    import { wpAjax } from '../../../front/admin/js/mixins';
     import { filterTypeMixin } from '../filter-types-mixin';
 
     export default {
diff --git a/src/classes/filter-types/tainacan-filter-item.vue b/src/classes/filter-types/tainacan-filter-item.vue
index f270c8689..213db1d8c 100644
--- a/src/classes/filter-types/tainacan-filter-item.vue
+++ b/src/classes/filter-types/tainacan-filter-item.vue
@@ -90,7 +90,7 @@
 </script>
 
 <style lang="scss">
-    @import "../../../src/front/scss/_variables.scss";
+    @import "../../../src/front/admin/scss/_variables.scss";
 
     .filter-item-forms {
 
diff --git a/src/classes/filter-types/taxonomy/Checkbox.vue b/src/classes/filter-types/taxonomy/Checkbox.vue
index 6e821b7f2..b7d19708c 100644
--- a/src/classes/filter-types/taxonomy/Checkbox.vue
+++ b/src/classes/filter-types/taxonomy/Checkbox.vue
@@ -49,7 +49,7 @@
     import qs from 'qs';
     import { tainacan as axios, CancelToken, isCancel } from '../../../js/axios/axios';
     import { mapGetters } from 'vuex';
-    import CheckboxRadioModal from '../../../front/components/other/checkbox-radio-modal.vue';
+    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue';
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
     
     export default {
diff --git a/src/classes/metadata-types/date/Date.vue b/src/classes/metadata-types/date/Date.vue
index 4ef5d5b1e..d56102f57 100644
--- a/src/classes/metadata-types/date/Date.vue
+++ b/src/classes/metadata-types/date/Date.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-    import { dateInter } from "../../../front/js/mixins";
+    import { dateInter } from "../../../front/admin/js/mixins";
     import moment from 'moment';
 
     export default {
diff --git a/src/classes/metadata-types/tainacan-form-item.vue b/src/classes/metadata-types/tainacan-form-item.vue
index 9eef32ab0..defcda9ff 100644
--- a/src/classes/metadata-types/tainacan-form-item.vue
+++ b/src/classes/metadata-types/tainacan-form-item.vue
@@ -209,7 +209,7 @@
 
 <style lang="scss" scoped>
 
-    @import '../../front/scss/_variables.scss'; 
+    @import '../../front/admin/scss/_variables.scss'; 
 
     .multiple-inputs {
         display: flex;
diff --git a/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue b/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue
index 2c1381c03..ad6f0df3d 100644
--- a/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue
+++ b/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue
@@ -66,7 +66,7 @@
 <script>
     import { tainacan as axios } from '../../../js/axios/axios';
     import qs from 'qs';
-    import CheckboxRadioModal from '../../../front/components/other/checkbox-radio-modal.vue'
+    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue'
 
     export default {
         created() {
diff --git a/src/classes/metadata-types/taxonomy/TaxonomyRadio.vue b/src/classes/metadata-types/taxonomy/TaxonomyRadio.vue
index 4be733a3d..672b1b335 100644
--- a/src/classes/metadata-types/taxonomy/TaxonomyRadio.vue
+++ b/src/classes/metadata-types/taxonomy/TaxonomyRadio.vue
@@ -75,7 +75,7 @@
 <script>
     import { tainacan as axios } from '../../../js/axios/axios';
     import qs from 'qs';
-    import CheckboxRadioModal from '../../../front/components/other/checkbox-radio-modal.vue'
+    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue'
 
     export default {
         created() {
diff --git a/src/front/admin.vue b/src/front/admin/admin.vue
similarity index 100%
rename from src/front/admin.vue
rename to src/front/admin/admin.vue
diff --git a/src/front/components/advanced-search/advanced-search.vue b/src/front/admin/components/advanced-search/advanced-search.vue
similarity index 100%
rename from src/front/components/advanced-search/advanced-search.vue
rename to src/front/admin/components/advanced-search/advanced-search.vue
diff --git a/src/front/components/bulk-edition/bulk-edition-modal.vue b/src/front/admin/components/bulk-edition/bulk-edition-modal.vue
similarity index 100%
rename from src/front/components/bulk-edition/bulk-edition-modal.vue
rename to src/front/admin/components/bulk-edition/bulk-edition-modal.vue
diff --git a/src/front/components/edition/collection-edition-form.vue b/src/front/admin/components/edition/collection-edition-form.vue
similarity index 100%
rename from src/front/components/edition/collection-edition-form.vue
rename to src/front/admin/components/edition/collection-edition-form.vue
diff --git a/src/front/components/edition/exporter-edition-form.vue b/src/front/admin/components/edition/exporter-edition-form.vue
similarity index 100%
rename from src/front/components/edition/exporter-edition-form.vue
rename to src/front/admin/components/edition/exporter-edition-form.vue
diff --git a/src/front/components/edition/filter-edition-form.vue b/src/front/admin/components/edition/filter-edition-form.vue
similarity index 100%
rename from src/front/components/edition/filter-edition-form.vue
rename to src/front/admin/components/edition/filter-edition-form.vue
diff --git a/src/front/components/edition/importer-edition-form.vue b/src/front/admin/components/edition/importer-edition-form.vue
similarity index 100%
rename from src/front/components/edition/importer-edition-form.vue
rename to src/front/admin/components/edition/importer-edition-form.vue
diff --git a/src/front/components/edition/importer-mapping-form.vue b/src/front/admin/components/edition/importer-mapping-form.vue
similarity index 100%
rename from src/front/components/edition/importer-mapping-form.vue
rename to src/front/admin/components/edition/importer-mapping-form.vue
diff --git a/src/front/components/edition/item-bulk-edition-form.vue b/src/front/admin/components/edition/item-bulk-edition-form.vue
similarity index 100%
rename from src/front/components/edition/item-bulk-edition-form.vue
rename to src/front/admin/components/edition/item-bulk-edition-form.vue
diff --git a/src/front/components/edition/item-edition-form.vue b/src/front/admin/components/edition/item-edition-form.vue
similarity index 99%
rename from src/front/components/edition/item-edition-form.vue
rename to src/front/admin/components/edition/item-edition-form.vue
index 3c5ab2ed5..66d0eebab 100644
--- a/src/front/components/edition/item-edition-form.vue
+++ b/src/front/admin/components/edition/item-edition-form.vue
@@ -762,7 +762,7 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import { eventBus } from '../../../js/event-bus-web-components.js'
+import { eventBus } from '../../../../js/event-bus-web-components.js'
 import wpMediaFrames from '../../js/wp-media-frames';
 import FileItem from '../other/file-item.vue';
 import DocumentItem from '../other/document-item.vue';
diff --git a/src/front/components/edition/metadatum-edition-form.vue b/src/front/admin/components/edition/metadatum-edition-form.vue
similarity index 100%
rename from src/front/components/edition/metadatum-edition-form.vue
rename to src/front/admin/components/edition/metadatum-edition-form.vue
diff --git a/src/front/components/edition/taxonomy-edition-form.vue b/src/front/admin/components/edition/taxonomy-edition-form.vue
similarity index 100%
rename from src/front/components/edition/taxonomy-edition-form.vue
rename to src/front/admin/components/edition/taxonomy-edition-form.vue
diff --git a/src/front/components/edition/term-edition-form.vue b/src/front/admin/components/edition/term-edition-form.vue
similarity index 100%
rename from src/front/components/edition/term-edition-form.vue
rename to src/front/admin/components/edition/term-edition-form.vue
diff --git a/src/front/components/lists/activities-list.vue b/src/front/admin/components/lists/activities-list.vue
similarity index 100%
rename from src/front/components/lists/activities-list.vue
rename to src/front/admin/components/lists/activities-list.vue
diff --git a/src/front/components/lists/attachments-list.vue b/src/front/admin/components/lists/attachments-list.vue
similarity index 100%
rename from src/front/components/lists/attachments-list.vue
rename to src/front/admin/components/lists/attachments-list.vue
diff --git a/src/front/components/lists/basic-term-item.vue b/src/front/admin/components/lists/basic-term-item.vue
similarity index 100%
rename from src/front/components/lists/basic-term-item.vue
rename to src/front/admin/components/lists/basic-term-item.vue
diff --git a/src/front/components/lists/capabilities-list.vue b/src/front/admin/components/lists/capabilities-list.vue
similarity index 100%
rename from src/front/components/lists/capabilities-list.vue
rename to src/front/admin/components/lists/capabilities-list.vue
diff --git a/src/front/components/lists/collections-home-list.vue b/src/front/admin/components/lists/collections-home-list.vue
similarity index 100%
rename from src/front/components/lists/collections-home-list.vue
rename to src/front/admin/components/lists/collections-home-list.vue
diff --git a/src/front/components/lists/collections-list.vue b/src/front/admin/components/lists/collections-list.vue
similarity index 100%
rename from src/front/components/lists/collections-list.vue
rename to src/front/admin/components/lists/collections-list.vue
diff --git a/src/front/components/lists/filters-list.vue b/src/front/admin/components/lists/filters-list.vue
similarity index 100%
rename from src/front/components/lists/filters-list.vue
rename to src/front/admin/components/lists/filters-list.vue
diff --git a/src/front/components/lists/items-list.vue b/src/front/admin/components/lists/items-list.vue
similarity index 99%
rename from src/front/components/lists/items-list.vue
rename to src/front/admin/components/lists/items-list.vue
index a6ccdd169..51b7c2881 100644
--- a/src/front/components/lists/items-list.vue
+++ b/src/front/admin/components/lists/items-list.vue
@@ -919,7 +919,7 @@ import { mapActions, mapGetters } from 'vuex';
 import CustomDialog from '../other/custom-dialog.vue';
 import ItemCopyDialog from '../other/item-copy-dialog.vue';
 import BulkEditionModal from '../bulk-edition/bulk-edition-modal.vue';
-import { dateInter } from "../../../front/js/mixins";
+import { dateInter } from "../../js/mixins";
 
 export default {
     name: 'ItemsList',
diff --git a/src/front/components/lists/metadata-list.vue b/src/front/admin/components/lists/metadata-list.vue
similarity index 100%
rename from src/front/components/lists/metadata-list.vue
rename to src/front/admin/components/lists/metadata-list.vue
diff --git a/src/front/components/lists/processes-list.vue b/src/front/admin/components/lists/processes-list.vue
similarity index 100%
rename from src/front/components/lists/processes-list.vue
rename to src/front/admin/components/lists/processes-list.vue
diff --git a/src/front/components/lists/recursive-term-item.vue b/src/front/admin/components/lists/recursive-term-item.vue
similarity index 100%
rename from src/front/components/lists/recursive-term-item.vue
rename to src/front/admin/components/lists/recursive-term-item.vue
diff --git a/src/front/components/lists/taxonomies-list.vue b/src/front/admin/components/lists/taxonomies-list.vue
similarity index 100%
rename from src/front/components/lists/taxonomies-list.vue
rename to src/front/admin/components/lists/taxonomies-list.vue
diff --git a/src/front/components/lists/terms-list.vue b/src/front/admin/components/lists/terms-list.vue
similarity index 100%
rename from src/front/components/lists/terms-list.vue
rename to src/front/admin/components/lists/terms-list.vue
diff --git a/src/front/components/navigation/primary-menu.vue b/src/front/admin/components/navigation/primary-menu.vue
similarity index 100%
rename from src/front/components/navigation/primary-menu.vue
rename to src/front/admin/components/navigation/primary-menu.vue
diff --git a/src/front/components/navigation/tainacan-collection-subheader.vue b/src/front/admin/components/navigation/tainacan-collection-subheader.vue
similarity index 100%
rename from src/front/components/navigation/tainacan-collection-subheader.vue
rename to src/front/admin/components/navigation/tainacan-collection-subheader.vue
diff --git a/src/front/components/navigation/tainacan-header.vue b/src/front/admin/components/navigation/tainacan-header.vue
similarity index 100%
rename from src/front/components/navigation/tainacan-header.vue
rename to src/front/admin/components/navigation/tainacan-header.vue
diff --git a/src/front/components/navigation/tainacan-repository-subheader.vue b/src/front/admin/components/navigation/tainacan-repository-subheader.vue
similarity index 100%
rename from src/front/components/navigation/tainacan-repository-subheader.vue
rename to src/front/admin/components/navigation/tainacan-repository-subheader.vue
diff --git a/src/front/components/navigation/tainacan-title.vue b/src/front/admin/components/navigation/tainacan-title.vue
similarity index 100%
rename from src/front/components/navigation/tainacan-title.vue
rename to src/front/admin/components/navigation/tainacan-title.vue
diff --git a/src/front/components/other/activity-details-modal.vue b/src/front/admin/components/other/activity-details-modal.vue
similarity index 100%
rename from src/front/components/other/activity-details-modal.vue
rename to src/front/admin/components/other/activity-details-modal.vue
diff --git a/src/front/components/other/available-exporters-modal.vue b/src/front/admin/components/other/available-exporters-modal.vue
similarity index 100%
rename from src/front/components/other/available-exporters-modal.vue
rename to src/front/admin/components/other/available-exporters-modal.vue
diff --git a/src/front/components/other/available-importers-modal.vue b/src/front/admin/components/other/available-importers-modal.vue
similarity index 100%
rename from src/front/components/other/available-importers-modal.vue
rename to src/front/admin/components/other/available-importers-modal.vue
diff --git a/src/front/components/other/capability-edition-modal.vue b/src/front/admin/components/other/capability-edition-modal.vue
similarity index 100%
rename from src/front/components/other/capability-edition-modal.vue
rename to src/front/admin/components/other/capability-edition-modal.vue
diff --git a/src/front/components/other/checkbox-radio-modal.vue b/src/front/admin/components/other/checkbox-radio-modal.vue
similarity index 99%
rename from src/front/components/other/checkbox-radio-modal.vue
rename to src/front/admin/components/other/checkbox-radio-modal.vue
index 2ed103415..9d7ccb374 100644
--- a/src/front/components/other/checkbox-radio-modal.vue
+++ b/src/front/admin/components/other/checkbox-radio-modal.vue
@@ -277,8 +277,8 @@
 
 <script>
     import qs from 'qs';
-    import { tainacan as axios, isCancel } from '../../../js/axios/axios';
-    import {  dynamicFilterTypeMixin } from '../../../classes/filter-types/filter-types-mixin';
+    import { tainacan as axios, isCancel } from '../../../../js/axios/axios';
+    import { dynamicFilterTypeMixin } from '../../../../classes/filter-types/filter-types-mixin';
 
     export default {
         name: 'CheckboxFilterModal',
diff --git a/src/front/components/other/circular-counter.vue b/src/front/admin/components/other/circular-counter.vue
similarity index 100%
rename from src/front/components/other/circular-counter.vue
rename to src/front/admin/components/other/circular-counter.vue
diff --git a/src/front/components/other/collections-modal.vue b/src/front/admin/components/other/collections-modal.vue
similarity index 100%
rename from src/front/components/other/collections-modal.vue
rename to src/front/admin/components/other/collections-modal.vue
diff --git a/src/front/components/other/custom-dialog.vue b/src/front/admin/components/other/custom-dialog.vue
similarity index 100%
rename from src/front/components/other/custom-dialog.vue
rename to src/front/admin/components/other/custom-dialog.vue
diff --git a/src/front/components/other/document-item.vue b/src/front/admin/components/other/document-item.vue
similarity index 100%
rename from src/front/components/other/document-item.vue
rename to src/front/admin/components/other/document-item.vue
diff --git a/src/front/components/other/exposers-modal.vue b/src/front/admin/components/other/exposers-modal.vue
similarity index 100%
rename from src/front/components/other/exposers-modal.vue
rename to src/front/admin/components/other/exposers-modal.vue
diff --git a/src/front/components/other/file-item.vue b/src/front/admin/components/other/file-item.vue
similarity index 100%
rename from src/front/components/other/file-item.vue
rename to src/front/admin/components/other/file-item.vue
diff --git a/src/front/components/other/help-button.vue b/src/front/admin/components/other/help-button.vue
similarity index 100%
rename from src/front/components/other/help-button.vue
rename to src/front/admin/components/other/help-button.vue
diff --git a/src/front/components/other/item-copy-dialog.vue b/src/front/admin/components/other/item-copy-dialog.vue
similarity index 100%
rename from src/front/components/other/item-copy-dialog.vue
rename to src/front/admin/components/other/item-copy-dialog.vue
diff --git a/src/front/components/other/processes-popup.vue b/src/front/admin/components/other/processes-popup.vue
similarity index 100%
rename from src/front/components/other/processes-popup.vue
rename to src/front/admin/components/other/processes-popup.vue
diff --git a/src/front/components/other/three-state-toggle-button.vue b/src/front/admin/components/other/three-state-toggle-button.vue
similarity index 100%
rename from src/front/components/other/three-state-toggle-button.vue
rename to src/front/admin/components/other/three-state-toggle-button.vue
diff --git a/src/front/components/repository/collection-filter/collection-filter.vue b/src/front/admin/components/repository/collection-filter/collection-filter.vue
similarity index 100%
rename from src/front/components/repository/collection-filter/collection-filter.vue
rename to src/front/admin/components/repository/collection-filter/collection-filter.vue
diff --git a/src/front/components/search/filters-items-list.vue b/src/front/admin/components/search/filters-items-list.vue
similarity index 100%
rename from src/front/components/search/filters-items-list.vue
rename to src/front/admin/components/search/filters-items-list.vue
diff --git a/src/front/components/search/filters-tags-list.vue b/src/front/admin/components/search/filters-tags-list.vue
similarity index 100%
rename from src/front/components/search/filters-tags-list.vue
rename to src/front/admin/components/search/filters-tags-list.vue
diff --git a/src/front/components/search/pagination.vue b/src/front/admin/components/search/pagination.vue
similarity index 100%
rename from src/front/components/search/pagination.vue
rename to src/front/admin/components/search/pagination.vue
diff --git a/src/front/js/main.js b/src/front/admin/js/main.js
similarity index 61%
rename from src/front/js/main.js
rename to src/front/admin/js/main.js
index 32e2d2e03..670f35c24 100644
--- a/src/front/js/main.js
+++ b/src/front/admin/js/main.js
@@ -11,46 +11,46 @@ import draggable from 'vuedraggable';
 import VueTheMask from 'vue-the-mask';
 
 // Custom elements
-import Text from '../../classes/metadata-types/text/Text.vue';
-import Textarea from '../../classes/metadata-types/textarea/Textarea.vue';
-import Selectbox from '../../classes/metadata-types/selectbox/Selectbox.vue';
-import Numeric from '../../classes/metadata-types/numeric/Numeric.vue';
-import Date from '../../classes/metadata-types/date/Date.vue';
-import Relationship from '../../classes/metadata-types/relationship/Relationship.vue';
-import Taxonomy from '../../classes/metadata-types/taxonomy/Taxonomy.vue';
+import Text from '../../../classes/metadata-types/text/Text.vue';
+import Textarea from '../../../classes/metadata-types/textarea/Textarea.vue';
+import Selectbox from '../../../classes/metadata-types/selectbox/Selectbox.vue';
+import Numeric from '../../../classes/metadata-types/numeric/Numeric.vue';
+import Date from '../../../classes/metadata-types/date/Date.vue';
+import Relationship from '../../../classes/metadata-types/relationship/Relationship.vue';
+import Taxonomy from '../../../classes/metadata-types/taxonomy/Taxonomy.vue';
 
-import FormRelationship from '../../classes/metadata-types/relationship/FormRelationship.vue';
-import FormTaxonomy from '../../classes/metadata-types/taxonomy/FormTaxonomy.vue';
-import FormSelectbox from '../../classes/metadata-types/selectbox/FormSelectbox.vue';
-import FormNumeric from '../../classes/metadata-types/numeric/FormNumeric.vue';
+import FormRelationship from '../../../classes/metadata-types/relationship/FormRelationship.vue';
+import FormTaxonomy from '../../../classes/metadata-types/taxonomy/FormTaxonomy.vue';
+import FormSelectbox from '../../../classes/metadata-types/selectbox/FormSelectbox.vue';
+import FormNumeric from '../../../classes/metadata-types/numeric/FormNumeric.vue';
 
-import FilterNumeric from '../../classes/filter-types/numeric/Numeric.vue';
-import FilterDate from '../../classes/filter-types/date/Date.vue';
-import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
-import FilterAutocomplete from '../../classes/filter-types/autocomplete/Autocomplete.vue';
-import FilterCheckbox from '../../classes/filter-types/checkbox/Checkbox.vue';
-import FilterTaginput from '../../classes/filter-types/taginput/Taginput.vue';
-import FilterNumericInterval from '../../classes/filter-types/numeric-interval/NumericInterval.vue';
-import FilterDateInterval from '../../classes/filter-types/date-interval/DateInterval.vue';
-import FilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
-import FilterTaxonomyCheckbox from '../../classes/filter-types/taxonomy/Checkbox.vue';
-import FilterTaxonomyTaginput from '../../classes/filter-types/taxonomy/Taginput.vue';
+import FilterNumeric from '../../../classes/filter-types/numeric/Numeric.vue';
+import FilterDate from '../../../classes/filter-types/date/Date.vue';
+import FilterSelectbox from '../../../classes/filter-types/selectbox/Selectbox.vue';
+import FilterAutocomplete from '../../../classes/filter-types/autocomplete/Autocomplete.vue';
+import FilterCheckbox from '../../../classes/filter-types/checkbox/Checkbox.vue';
+import FilterTaginput from '../../../classes/filter-types/taginput/Taginput.vue';
+import FilterNumericInterval from '../../../classes/filter-types/numeric-interval/NumericInterval.vue';
+import FilterDateInterval from '../../../classes/filter-types/date-interval/DateInterval.vue';
+import FilterNumericListInterval from '../../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
+import FilterTaxonomyCheckbox from '../../../classes/filter-types/taxonomy/Checkbox.vue';
+import FilterTaxonomyTaginput from '../../../classes/filter-types/taxonomy/Taginput.vue';
 
-import FormFilterNumeric from '../../classes/filter-types/numeric/FormNumeric.vue';
-import FormFilterNumericInterval from '../../classes/filter-types/numeric-interval/FormNumericInterval.vue';
-import FormFilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/FormNumericListInterval.vue';
-// import FormDate from '../../classes/filter-types/date/FormDate.vue';
+import FormFilterNumeric from '../../../classes/filter-types/numeric/FormNumeric.vue';
+import FormFilterNumericInterval from '../../../classes/filter-types/numeric-interval/FormNumericInterval.vue';
+import FormFilterNumericListInterval from '../../../classes/filter-types/numeric-list-interval/FormNumericListInterval.vue';
+// import FormDate from '../../../classes/filter-types/date/FormDate.vue';
 
-import TainacanFormItem from '../../classes/metadata-types/tainacan-form-item.vue';
-import TainacanFiltersList from '../../classes/filter-types/tainacan-filter-item.vue';
+import TainacanFormItem from '../../../classes/metadata-types/tainacan-form-item.vue';
+import TainacanFiltersList from '../../../classes/filter-types/tainacan-filter-item.vue';
 
 // Remaining imports
 import AdminPage from '../admin.vue'
 import HelpButton from '../components/other/help-button.vue';
 import TainacanTitle from '../components/navigation/tainacan-title.vue';
-import store from '../../js/store/store'
+import store from '../../../js/store/store'
 import router from './router'
-import eventBusSearch from '../../js/event-bus-search';
+import eventBusSearch from '../../../js/event-bus-search';
 import termsListBus from './terms-list-bus.js';
 import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, UserCapabilitiesPlugin, StatusHelperPlugin, CommentsStatusHelperPlugin } from './utilities';
 
diff --git a/src/front/js/mixins.js b/src/front/admin/js/mixins.js
similarity index 100%
rename from src/front/js/mixins.js
rename to src/front/admin/js/mixins.js
diff --git a/src/front/js/router.js b/src/front/admin/js/router.js
similarity index 100%
rename from src/front/js/router.js
rename to src/front/admin/js/router.js
diff --git a/src/front/js/terms-list-bus.js b/src/front/admin/js/terms-list-bus.js
similarity index 100%
rename from src/front/js/terms-list-bus.js
rename to src/front/admin/js/terms-list-bus.js
diff --git a/src/front/js/theme-main.js b/src/front/admin/js/theme-main.js
similarity index 71%
rename from src/front/js/theme-main.js
rename to src/front/admin/js/theme-main.js
index e13e27840..42cc786f1 100644
--- a/src/front/js/theme-main.js
+++ b/src/front/admin/js/theme-main.js
@@ -5,31 +5,31 @@ import VTooltip from 'v-tooltip';
 import VueMasonry from 'vue-masonry-css';
 
 // Custom elements
-import FilterNumeric from '../../classes/filter-types/numeric/Numeric.vue';
-import FilterDate from '../../classes/filter-types/date/Date.vue';
-import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
-import FilterAutocomplete from '../../classes/filter-types/autocomplete/Autocomplete.vue';
-import FilterCheckbox from '../../classes/filter-types/checkbox/Checkbox.vue';
-import FilterTaginput from '../../classes/filter-types/taginput/Taginput.vue';
-import FilterTaxonomyCheckbox from '../../classes/filter-types/taxonomy/Checkbox.vue';
-import FilterTaxonomyTaginput from '../../classes/filter-types/taxonomy/Taginput.vue';
-import FilterDateInterval from '../../classes/filter-types/date-interval/DateInterval.vue';
-import FilterNumericInterval from '../../classes/filter-types/numeric-interval/NumericInterval.vue';
-import FilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
+import FilterNumeric from '../../../classes/filter-types/numeric/Numeric.vue';
+import FilterDate from '../../../classes/filter-types/date/Date.vue';
+import FilterSelectbox from '../../../classes/filter-types/selectbox/Selectbox.vue';
+import FilterAutocomplete from '../../../classes/filter-types/autocomplete/Autocomplete.vue';
+import FilterCheckbox from '../../../classes/filter-types/checkbox/Checkbox.vue';
+import FilterTaginput from '../../../classes/filter-types/taginput/Taginput.vue';
+import FilterTaxonomyCheckbox from '../../../classes/filter-types/taxonomy/Checkbox.vue';
+import FilterTaxonomyTaginput from '../../../classes/filter-types/taxonomy/Taginput.vue';
+import FilterDateInterval from '../../../classes/filter-types/date-interval/DateInterval.vue';
+import FilterNumericInterval from '../../../classes/filter-types/numeric-interval/NumericInterval.vue';
+import FilterNumericListInterval from '../../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
 
-import TaincanFiltersList from '../../classes/filter-types/tainacan-filter-item.vue';
+import TaincanFiltersList from '../../../classes/filter-types/tainacan-filter-item.vue';
 import ItemsPage from '../pages/lists/items-page.vue';
 import TermItemsPage from '../pages/lists/term-items-page.vue';
-import ViewModeTable from '../../theme-helper/view-mode-table.vue';
-import ViewModeCards from '../../theme-helper/view-mode-cards.vue';
-import ViewModeRecords from '../../theme-helper/view-mode-records.vue';
-import ViewModeMasonry from '../../theme-helper/view-mode-masonry.vue';
-import ViewModeSlideshow from '../../theme-helper/view-mode-slideshow.vue';
+import ViewModeTable from '../../../theme-helper/view-mode-table.vue';
+import ViewModeCards from '../../../theme-helper/view-mode-cards.vue';
+import ViewModeRecords from '../../../theme-helper/view-mode-records.vue';
+import ViewModeMasonry from '../../../theme-helper/view-mode-masonry.vue';
+import ViewModeSlideshow from '../../../theme-helper/view-mode-slideshow.vue';
 
 // Remaining imports
-import store from '../../js/store/store'
+import store from '../../../js/store/store'
 import routerTheme from './theme-router.js'
-import eventBusSearch from '../../js/event-bus-search';
+import eventBusSearch from '../../../js/event-bus-search';
 import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, StatusHelperPlugin } from './utilities';
 
 // Configure and Register Plugins
diff --git a/src/front/js/theme-router.js b/src/front/admin/js/theme-router.js
similarity index 100%
rename from src/front/js/theme-router.js
rename to src/front/admin/js/theme-router.js
diff --git a/src/front/js/utilities.js b/src/front/admin/js/utilities.js
similarity index 100%
rename from src/front/js/utilities.js
rename to src/front/admin/js/utilities.js
diff --git a/src/front/js/wp-media-frames.js b/src/front/admin/js/wp-media-frames.js
similarity index 100%
rename from src/front/js/wp-media-frames.js
rename to src/front/admin/js/wp-media-frames.js
diff --git a/src/front/pages/home-page.vue b/src/front/admin/pages/home-page.vue
similarity index 100%
rename from src/front/pages/home-page.vue
rename to src/front/admin/pages/home-page.vue
diff --git a/src/front/pages/lists/activities-page.vue b/src/front/admin/pages/lists/activities-page.vue
similarity index 99%
rename from src/front/pages/lists/activities-page.vue
rename to src/front/admin/pages/lists/activities-page.vue
index a13251daf..1a7d8dc03 100644
--- a/src/front/pages/lists/activities-page.vue
+++ b/src/front/admin/pages/lists/activities-page.vue
@@ -264,7 +264,7 @@
 <script>
     import ActivitiesList from "../../components/lists/activities-list.vue";
     import ProcessesList from "../../components/lists/processes-list.vue";
-    import { dateInter } from "../../../front/js/mixins";
+    import { dateInter } from "../../js/mixins";
     import { mapActions, mapGetters } from 'vuex';
     import moment from 'moment'
 
diff --git a/src/front/pages/lists/available-exporters-page.vue b/src/front/admin/pages/lists/available-exporters-page.vue
similarity index 100%
rename from src/front/pages/lists/available-exporters-page.vue
rename to src/front/admin/pages/lists/available-exporters-page.vue
diff --git a/src/front/pages/lists/available-importers-page.vue b/src/front/admin/pages/lists/available-importers-page.vue
similarity index 100%
rename from src/front/pages/lists/available-importers-page.vue
rename to src/front/admin/pages/lists/available-importers-page.vue
diff --git a/src/front/pages/lists/capabilities-page.vue b/src/front/admin/pages/lists/capabilities-page.vue
similarity index 100%
rename from src/front/pages/lists/capabilities-page.vue
rename to src/front/admin/pages/lists/capabilities-page.vue
diff --git a/src/front/pages/lists/collections-page.vue b/src/front/admin/pages/lists/collections-page.vue
similarity index 100%
rename from src/front/pages/lists/collections-page.vue
rename to src/front/admin/pages/lists/collections-page.vue
diff --git a/src/front/pages/lists/filters-page.vue b/src/front/admin/pages/lists/filters-page.vue
similarity index 100%
rename from src/front/pages/lists/filters-page.vue
rename to src/front/admin/pages/lists/filters-page.vue
diff --git a/src/front/pages/lists/items-page.vue b/src/front/admin/pages/lists/items-page.vue
similarity index 100%
rename from src/front/pages/lists/items-page.vue
rename to src/front/admin/pages/lists/items-page.vue
diff --git a/src/front/pages/lists/metadata-page.vue b/src/front/admin/pages/lists/metadata-page.vue
similarity index 100%
rename from src/front/pages/lists/metadata-page.vue
rename to src/front/admin/pages/lists/metadata-page.vue
diff --git a/src/front/pages/lists/taxonomies-page.vue b/src/front/admin/pages/lists/taxonomies-page.vue
similarity index 100%
rename from src/front/pages/lists/taxonomies-page.vue
rename to src/front/admin/pages/lists/taxonomies-page.vue
diff --git a/src/front/pages/lists/term-items-page.vue b/src/front/admin/pages/lists/term-items-page.vue
similarity index 100%
rename from src/front/pages/lists/term-items-page.vue
rename to src/front/admin/pages/lists/term-items-page.vue
diff --git a/src/front/pages/singles/collection-page.vue b/src/front/admin/pages/singles/collection-page.vue
similarity index 100%
rename from src/front/pages/singles/collection-page.vue
rename to src/front/admin/pages/singles/collection-page.vue
diff --git a/src/front/pages/singles/item-page.vue b/src/front/admin/pages/singles/item-page.vue
similarity index 100%
rename from src/front/pages/singles/item-page.vue
rename to src/front/admin/pages/singles/item-page.vue
diff --git a/src/front/scss/_buttons.scss b/src/front/admin/scss/_buttons.scss
similarity index 100%
rename from src/front/scss/_buttons.scss
rename to src/front/admin/scss/_buttons.scss
diff --git a/src/front/scss/_checkboxes.scss b/src/front/admin/scss/_checkboxes.scss
similarity index 100%
rename from src/front/scss/_checkboxes.scss
rename to src/front/admin/scss/_checkboxes.scss
diff --git a/src/front/scss/_collection-home-cards.scss b/src/front/admin/scss/_collection-home-cards.scss
similarity index 100%
rename from src/front/scss/_collection-home-cards.scss
rename to src/front/admin/scss/_collection-home-cards.scss
diff --git a/src/front/scss/_dropdown-and-autocomplete.scss b/src/front/admin/scss/_dropdown-and-autocomplete.scss
similarity index 100%
rename from src/front/scss/_dropdown-and-autocomplete.scss
rename to src/front/admin/scss/_dropdown-and-autocomplete.scss
diff --git a/src/front/scss/_filters-menu-modal.scss b/src/front/admin/scss/_filters-menu-modal.scss
similarity index 100%
rename from src/front/scss/_filters-menu-modal.scss
rename to src/front/admin/scss/_filters-menu-modal.scss
diff --git a/src/front/scss/_iframe_read_mode_overrides.scss b/src/front/admin/scss/_iframe_read_mode_overrides.scss
similarity index 100%
rename from src/front/scss/_iframe_read_mode_overrides.scss
rename to src/front/admin/scss/_iframe_read_mode_overrides.scss
diff --git a/src/front/scss/_inputs.scss b/src/front/admin/scss/_inputs.scss
similarity index 100%
rename from src/front/scss/_inputs.scss
rename to src/front/admin/scss/_inputs.scss
diff --git a/src/front/scss/_modals.scss b/src/front/admin/scss/_modals.scss
similarity index 100%
rename from src/front/scss/_modals.scss
rename to src/front/admin/scss/_modals.scss
diff --git a/src/front/scss/_notices.scss b/src/front/admin/scss/_notices.scss
similarity index 100%
rename from src/front/scss/_notices.scss
rename to src/front/admin/scss/_notices.scss
diff --git a/src/front/scss/_pagination.scss b/src/front/admin/scss/_pagination.scss
similarity index 100%
rename from src/front/scss/_pagination.scss
rename to src/front/admin/scss/_pagination.scss
diff --git a/src/front/scss/_radios.scss b/src/front/admin/scss/_radios.scss
similarity index 100%
rename from src/front/scss/_radios.scss
rename to src/front/admin/scss/_radios.scss
diff --git a/src/front/scss/_repository-level-overrides.scss b/src/front/admin/scss/_repository-level-overrides.scss
similarity index 100%
rename from src/front/scss/_repository-level-overrides.scss
rename to src/front/admin/scss/_repository-level-overrides.scss
diff --git a/src/front/scss/_selects.scss b/src/front/admin/scss/_selects.scss
similarity index 100%
rename from src/front/scss/_selects.scss
rename to src/front/admin/scss/_selects.scss
diff --git a/src/front/scss/_switches.scss b/src/front/admin/scss/_switches.scss
similarity index 100%
rename from src/front/scss/_switches.scss
rename to src/front/admin/scss/_switches.scss
diff --git a/src/front/scss/_tables.scss b/src/front/admin/scss/_tables.scss
similarity index 100%
rename from src/front/scss/_tables.scss
rename to src/front/admin/scss/_tables.scss
diff --git a/src/front/scss/_tabs.scss b/src/front/admin/scss/_tabs.scss
similarity index 100%
rename from src/front/scss/_tabs.scss
rename to src/front/admin/scss/_tabs.scss
diff --git a/src/front/scss/_tags.scss b/src/front/admin/scss/_tags.scss
similarity index 100%
rename from src/front/scss/_tags.scss
rename to src/front/admin/scss/_tags.scss
diff --git a/src/front/scss/_tainacan-form.scss b/src/front/admin/scss/_tainacan-form.scss
similarity index 100%
rename from src/front/scss/_tainacan-form.scss
rename to src/front/admin/scss/_tainacan-form.scss
diff --git a/src/front/scss/_tooltips.scss b/src/front/admin/scss/_tooltips.scss
similarity index 100%
rename from src/front/scss/_tooltips.scss
rename to src/front/admin/scss/_tooltips.scss
diff --git a/src/front/scss/_upload.scss b/src/front/admin/scss/_upload.scss
similarity index 100%
rename from src/front/scss/_upload.scss
rename to src/front/admin/scss/_upload.scss
diff --git a/src/front/scss/_variables.scss b/src/front/admin/scss/_variables.scss
similarity index 98%
rename from src/front/scss/_variables.scss
rename to src/front/admin/scss/_variables.scss
index ed5fc7c0f..4f5056c9d 100644
--- a/src/front/scss/_variables.scss
+++ b/src/front/admin/scss/_variables.scss
@@ -1,6 +1,6 @@
 // Import Bulma's core and variables
-@import "../../../node_modules/bulma/sass/utilities/initial-variables";
-@import "../../../node_modules/bulma/sass/utilities/functions";
+@import "../../../../node_modules/bulma/sass/utilities/initial-variables";
+@import "../../../../node_modules/bulma/sass/utilities/functions";
 
 // NEW TAINACAN CUSTOM COLORS ------------------
 // Blue, used mainly for repository
@@ -70,7 +70,7 @@ $warning-invert: findColorInvert($warning);
 $gray: $gray4;
 $gray-invert: findColorInvert($gray4);
 
-@import "../../../node_modules/bulma/sass/utilities/derived-variables.sass";
+@import "../../../../node_modules/bulma/sass/utilities/derived-variables.sass";
 
 // Setup $colors to use as bulma classes
 $colors: (
diff --git a/src/front/scss/_view-mode-cards.scss b/src/front/admin/scss/_view-mode-cards.scss
similarity index 100%
rename from src/front/scss/_view-mode-cards.scss
rename to src/front/admin/scss/_view-mode-cards.scss
diff --git a/src/front/scss/_view-mode-grid.scss b/src/front/admin/scss/_view-mode-grid.scss
similarity index 100%
rename from src/front/scss/_view-mode-grid.scss
rename to src/front/admin/scss/_view-mode-grid.scss
diff --git a/src/front/scss/_view-mode-masonry.scss b/src/front/admin/scss/_view-mode-masonry.scss
similarity index 100%
rename from src/front/scss/_view-mode-masonry.scss
rename to src/front/admin/scss/_view-mode-masonry.scss
diff --git a/src/front/scss/_view-mode-records.scss b/src/front/admin/scss/_view-mode-records.scss
similarity index 100%
rename from src/front/scss/_view-mode-records.scss
rename to src/front/admin/scss/_view-mode-records.scss
diff --git a/src/front/scss/_view-mode-slideshow.scss b/src/front/admin/scss/_view-mode-slideshow.scss
similarity index 100%
rename from src/front/scss/_view-mode-slideshow.scss
rename to src/front/admin/scss/_view-mode-slideshow.scss
diff --git a/src/front/scss/tainacan-admin.scss b/src/front/admin/scss/tainacan-admin.scss
similarity index 94%
rename from src/front/scss/tainacan-admin.scss
rename to src/front/admin/scss/tainacan-admin.scss
index 4e7f33e2c..77cbb137b 100644
--- a/src/front/scss/tainacan-admin.scss
+++ b/src/front/admin/scss/tainacan-admin.scss
@@ -1,13 +1,13 @@
 // TAINACAN ICON FONT
-@import "../../assets/css/fonts/tainacanicons.css";
+@import "../../../assets/css/fonts/tainacanicons.css";
 
 // Tainacan custom colors and bulma's core
 @import "./_variables.scss";
 
 // Import Bulma and Buefy styles
-@import "../../assets/css/fonts/materialdesignicons.css";
-@import "../../../node_modules/bulma/bulma.sass";
-@import "../../../node_modules/buefy/src/scss/buefy.scss";
+@import "../../../assets/css/fonts/materialdesignicons.css";
+@import "../../../../node_modules/bulma/bulma.sass";
+@import "../../../../node_modules/buefy/src/scss/buefy.scss";
 
 // Import Tainacan custom styles
 @import "../scss/_tainacan-form.scss";
diff --git a/src/front/admin/scss/theme-basics.sass b/src/front/admin/scss/theme-basics.sass
new file mode 100644
index 000000000..aa303e24f
--- /dev/null
+++ b/src/front/admin/scss/theme-basics.sass
@@ -0,0 +1,11 @@
+@import "../../../../node_modules/bulma/sass/utilities/_all.sass"
+@import "../../../../node_modules/bulma/sass/base/helpers.sass"
+@import "../../../../node_modules/bulma/sass/form/_all.sass"
+@import "../../../../node_modules/bulma/sass/components/pagination.sass"
+@import "../../../../node_modules/bulma/sass/elements/icon.sass"
+@import "../../../../node_modules/bulma/sass/elements/tag.sass"
+@import "../../../../node_modules/bulma/sass/components/tabs.sass"
+@import "../../../../node_modules/bulma/sass/elements/button.sass"
+@import "../../../../node_modules/bulma/sass/grid/columns.sass"
+@import "../../../../node_modules/bulma/sass/components/dropdown.sass"
+@import "../../../../node_modules/bulma/sass/components/modal.sass"
\ No newline at end of file
diff --git a/src/front/theme-items-list.vue b/src/front/admin/theme-items-list.vue
similarity index 83%
rename from src/front/theme-items-list.vue
rename to src/front/admin/theme-items-list.vue
index c639bf31a..96d93b1b4 100644
--- a/src/front/theme-items-list.vue
+++ b/src/front/admin/theme-items-list.vue
@@ -39,32 +39,32 @@ export default {
     @import "./scss/theme-basics.sass";
 
     // Buefy imports
-    @import "../../node_modules/buefy/src/scss/utils/_all.scss";
-    @import "../../node_modules/buefy/src/scss/components/_datepicker.scss";
-    @import "../../node_modules/buefy/src/scss/components/_checkbox.scss";
-    @import "../../node_modules/buefy/src/scss/components/_radio.scss";
-    @import "../../node_modules/buefy/src/scss/components/_tag.scss";
-    @import "../../node_modules/buefy/src/scss/components/_loading.scss";
-    @import "../../node_modules/buefy/src/scss/components/_dropdown.scss";
-    @import "../../node_modules/buefy/src/scss/components/_modal.scss";
-    @import "../../node_modules/buefy/src/scss/components/_notices.scss";
-    @import "../../node_modules/buefy/src/scss/components/_numberinput.scss";
+    @import "../../../node_modules/buefy/src/scss/utils/_all.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_datepicker.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_checkbox.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_radio.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_tag.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_loading.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_dropdown.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_modal.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_notices.scss";
+    @import "../../../node_modules/buefy/src/scss/components/_numberinput.scss";
 
     // Tainacan imports
-    @import "../front/scss/_tables.scss";
-    @import "../front/scss/_modals.scss";
-    @import "../front/scss/_buttons.scss"; 
-    @import "../front/scss/_inputs.scss";
-    @import "../front/scss/_checkboxes.scss";
-    @import "../front/scss/_pagination.scss";
-    @import "../front/scss/_tags.scss";
-    @import "../front/scss/_notices.scss";
-    @import "../front/scss/_tabs.scss";
-    @import "../front/scss/_selects.scss";
-    @import "../front/scss/_dropdown-and-autocomplete.scss";
-    @import "../front/scss/_tooltips.scss";
-    @import "../front/scss/_tainacan-form.scss";
-    @import "../front/scss/_filters-menu-modal.scss";
+    @import "./scss/_tables.scss";
+    @import "./scss/_modals.scss";
+    @import "./scss/_buttons.scss"; 
+    @import "./scss/_inputs.scss";
+    @import "./scss/_checkboxes.scss";
+    @import "./scss/_pagination.scss";
+    @import "./scss/_tags.scss";
+    @import "./scss/_notices.scss";
+    @import "./scss/_tabs.scss";
+    @import "./scss/_selects.scss";
+    @import "./scss/_dropdown-and-autocomplete.scss";
+    @import "./scss/_tooltips.scss";
+    @import "./scss/_tainacan-form.scss";
+    @import "./scss/_filters-menu-modal.scss";
 
     .theme-items-list {
         position: relative;
diff --git a/src/front/scss/tainacan-roles.scss b/src/front/roles/tainacan-roles.scss
similarity index 100%
rename from src/front/scss/tainacan-roles.scss
rename to src/front/roles/tainacan-roles.scss
diff --git a/src/front/scss/theme-basics.sass b/src/front/scss/theme-basics.sass
deleted file mode 100644
index 8692c6049..000000000
--- a/src/front/scss/theme-basics.sass
+++ /dev/null
@@ -1,11 +0,0 @@
-@import "../../../node_modules/bulma/sass/utilities/_all.sass"
-@import "../../../node_modules/bulma/sass/base/helpers.sass"
-@import "../../../node_modules/bulma/sass/form/_all.sass"
-@import "../../../node_modules/bulma/sass/components/pagination.sass"
-@import "../../../node_modules/bulma/sass/elements/icon.sass"
-@import "../../../node_modules/bulma/sass/elements/tag.sass"
-@import "../../../node_modules/bulma/sass/components/tabs.sass"
-@import "../../../node_modules/bulma/sass/elements/button.sass"
-@import "../../../node_modules/bulma/sass/grid/columns.sass"
-@import "../../../node_modules/bulma/sass/components/dropdown.sass"
-@import "../../../node_modules/bulma/sass/components/modal.sass"
\ No newline at end of file
diff --git a/src/theme-helper/view-mode-cards.vue b/src/theme-helper/view-mode-cards.vue
index 1c29c0507..cda9def79 100644
--- a/src/theme-helper/view-mode-cards.vue
+++ b/src/theme-helper/view-mode-cards.vue
@@ -164,7 +164,7 @@ export default {
         display: grid;
     }
 
-    @import "../../src/front/scss/_view-mode-cards.scss";
+    @import "../../src/front/admin/scss/_view-mode-cards.scss";
 
     .tainacan-cards-container .tainacan-card .metadata-title {
         padding: 0.6rem 0.75rem;
diff --git a/src/theme-helper/view-mode-masonry.vue b/src/theme-helper/view-mode-masonry.vue
index f3b047af2..88b2bd405 100644
--- a/src/theme-helper/view-mode-masonry.vue
+++ b/src/theme-helper/view-mode-masonry.vue
@@ -184,7 +184,7 @@ export default {
     $gray3: #dcdcdc;
     $gray4: #555758;
 
-    @import "../../src/front/scss/_view-mode-masonry.scss";
+    @import "../../src/front/admin/scss/_view-mode-masonry.scss";
 
     .tainacan-masonry-container .tainacan-masonry-item .metadata-title {
         margin: 0px 6px;
diff --git a/src/theme-helper/view-mode-records.vue b/src/theme-helper/view-mode-records.vue
index d8a2b7748..a2ae60413 100644
--- a/src/theme-helper/view-mode-records.vue
+++ b/src/theme-helper/view-mode-records.vue
@@ -206,7 +206,7 @@ export default {
     $gray4: #555758;
     $gray5: #454647; 
 
-    @import "../../src/front/scss/_view-mode-records.scss";
+    @import "../../src/front/admin/scss/_view-mode-records.scss";
 
     .tainacan-records-container .tainacan-record .metadata-title {
         padding: 0.6rem 0.75rem;
diff --git a/src/theme-helper/view-mode-slideshow.vue b/src/theme-helper/view-mode-slideshow.vue
index cef1a0d73..414cfca8f 100644
--- a/src/theme-helper/view-mode-slideshow.vue
+++ b/src/theme-helper/view-mode-slideshow.vue
@@ -306,7 +306,7 @@ import { mapActions, mapGetters } from 'vuex';
 import axios from '../js/axios/axios.js';
 import 'swiper/dist/css/swiper.css';
 import { swiper, swiperSlide } from 'vue-awesome-swiper';
-import CircularCounter from '../front/components/other/circular-counter.vue';
+import CircularCounter from '../front/admin/components/other/circular-counter.vue';
  
 export default {
     name: 'ViewModeSlideshow',
@@ -663,7 +663,7 @@ export default {
     $page-small-side-padding: 25px;
     $page-side-padding: 4.166666667%; 
 
-    @import "../../src/front/scss/_view-mode-slideshow.scss";
+    @import "../../src/front/admin/scss/_view-mode-slideshow.scss";
 
     .is-fullscreen .table-wrapper {
         overflow: hidden !important;
diff --git a/webpack.config.js b/webpack.config.js
index 042c314b1..d783a996d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,8 +5,8 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 
 module.exports = {
     entry: {
-        search: './src/front/js/theme-main.js',
-        admin: './src/front/js/main.js',
+        search: './src/front/admin/js/theme-main.js',
+        admin: './src/front/admin/js/main.js',
         roles: './src/front/roles/js/roles-main.js',
 
         gutenberg_terms_list: './src/front/gutenberg-blocks/tainacan-terms/terms-list/index.js',
@@ -83,7 +83,7 @@ module.exports = {
                     {
                         loader: 'sass-loader',
                         options: {
-                            includePaths: [path.resolve(__dirname, './src/front/scss/_variables.scss')]
+                            includePaths: [path.resolve(__dirname, './src/front/admin/scss/_variables.scss')]
                         }
                     },
                 ],