diff --git a/src/classes/filter-types/checkbox/Checkbox.vue b/src/classes/filter-types/checkbox/Checkbox.vue
index 72377054a..257696f97 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 '../../../front/admin/js/axios';
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
-    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue';
+    import CheckboxRadioModal from '../../../front/admin/components/modals/checkbox-radio-modal.vue';
 
     export default {
         mixins: [filterTypeMixin, dynamicFilterTypeMixin],
diff --git a/src/classes/filter-types/taxonomy/Checkbox.vue b/src/classes/filter-types/taxonomy/Checkbox.vue
index e4d95411c..8d694aeb0 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 '../../../front/admin/js/axios';
     import { mapGetters } from 'vuex';
-    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue';
+    import CheckboxRadioModal from '../../../front/admin/components/modals/checkbox-radio-modal.vue';
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
     
     export default {
diff --git a/src/classes/metadata-types/tainacan-form-item.vue b/src/classes/metadata-types/tainacan-form-item.vue
index d2907eeca..796205985 100644
--- a/src/classes/metadata-types/tainacan-form-item.vue
+++ b/src/classes/metadata-types/tainacan-form-item.vue
@@ -102,7 +102,7 @@
 </template>
 
 <script>
-    import { eventBus } from '../../front/admin/js/event-bus-web-components'
+    import { eventBusItemMetadata } from '../../front/admin/js/event-bus-item-metadata'
 
     export default {
         name: 'TainacanFormItem',
@@ -123,7 +123,7 @@
         },
         created() {
             this.createInputs();
-            eventBus.$on('updateErrorMessageOf#' + this.metadatum.metadatum.id, (errors) => {
+            eventBusItemMetadata.$on('updateErrorMessageOf#' + this.metadatum.metadatum.id, (errors) => {
                 let updatedErrorMessage = '';
                 if (errors && this.metadatum.metadatum.id == errors.metadatum_id && errors.errors) {
                     for (let error of errors.errors) { 
@@ -176,7 +176,7 @@
                     return
                 }
 
-                eventBus.$emit('input', {
+                eventBusItemMetadata.$emit('input', {
                     itemId: this.metadatum.item.id,
                     metadatumId: this.metadatum.metadatum.id,
                     values: this.inputs ? this.inputs : ''
@@ -202,7 +202,7 @@
             }
         },
         beforeDestroy() {
-            eventBus.$off('updateErrorMessageOf#' + this.metadatum.metadatum.id);
+            eventBusItemMetadata.$off('updateErrorMessageOf#' + this.metadatum.metadatum.id);
         }
     }
 </script>
diff --git a/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue b/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue
index 63252b69f..599046f93 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 '../../../front/admin/js/axios';
     import qs from 'qs';
-    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue'
+    import CheckboxRadioModal from '../../../front/admin/components/modals/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 7bedd53e6..cc5241e6f 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 '../../../front/admin/js/axios';
     import qs from 'qs';
-    import CheckboxRadioModal from '../../../front/admin/components/other/checkbox-radio-modal.vue'
+    import CheckboxRadioModal from '../../../front/admin/components/modals/checkbox-radio-modal.vue'
 
     export default {
         created() {
diff --git a/src/front/admin/components/edition/item-bulk-edition-form.vue b/src/front/admin/components/edition/item-bulk-edition-form.vue
index 4feb6922d..3ddb41385 100644
--- a/src/front/admin/components/edition/item-bulk-edition-form.vue
+++ b/src/front/admin/components/edition/item-bulk-edition-form.vue
@@ -187,7 +187,7 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
 import CustomDialog from '../other/custom-dialog.vue';
-import BulkEditionModal from '../bulk-edition/bulk-edition-modal.vue';
+import BulkEditionModal from '../modals/bulk-edition-modal.vue';
 
 export default {
     name: 'ItemBulkEditionForm',
diff --git a/src/front/admin/components/edition/item-edition-form.vue b/src/front/admin/components/edition/item-edition-form.vue
index 1fb64d56d..b2bcd17f5 100644
--- a/src/front/admin/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';
+import { eventBusItemMetadata } from '../../js/event-bus-item-metadata';
 import wpMediaFrames from '../../js/wp-media-frames';
 import FileItem from '../other/file-item.vue';
 import DocumentItem from '../other/document-item.vue';
@@ -848,7 +848,7 @@ export default {
 
             // Clear form variables
             this.cleanMetadata();
-            eventBus.clearAllErrors();
+            eventBusItemMetadata.clearAllErrors();
             this.formErrorMessage = '';
 
             this.isLoading = true;
@@ -957,7 +957,7 @@ export default {
                 if (errors.errors) {
                     for (let error of errors.errors) {
                         for (let metadatum of Object.keys(error)){
-                            eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
+                            eventBusItemMetadata.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                         }   
                     }
                     this.formErrorMessage = errors.error_message;
@@ -1055,7 +1055,7 @@ export default {
             .catch((errors) => {
                 for (let error of errors.errors) {
                     for (let metadatum of Object.keys(error)){
-                       eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
+                       eventBusItemMetadata.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                     }
                 }
                 this.formErrorMessage = errors.error_message;
@@ -1087,7 +1087,7 @@ export default {
                 .catch((errors) => {
                     for (let error of errors.errors) {
                         for (let metadatum of Object.keys(error)){
-                            eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
+                            eventBusItemMetadata.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                         }
                     }
                     this.formErrorMessage = errors.error_message;
@@ -1118,7 +1118,7 @@ export default {
             .catch((errors) => {
                 for (let error of errors.errors) {
                     for (let metadatum of Object.keys(error)){
-                        eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
+                        eventBusItemMetadata.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                     }
                 }
                 this.formErrorMessage = errors.error_message;
@@ -1185,7 +1185,7 @@ export default {
                         .catch((errors) => {
                             for (let error of errors.errors) {
                                 for (let metadatum of Object.keys(error)){
-                                    eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
+                                    eventBusItemMetadata.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
                                 }
                             }
                             this.formErrorMessage = errors.error_message;
@@ -1332,7 +1332,7 @@ export default {
     created(){
         // Obtains collection ID
         this.cleanMetadata();
-        eventBus.clearAllErrors();
+        eventBusItemMetadata.clearAllErrors();
         this.formErrorMessage = '';
         this.collectionId = this.$route.params.collectionId;
         this.form.collectionId = this.collectionId;
@@ -1378,10 +1378,10 @@ export default {
         }
 
         // Sets feedback variables
-        eventBus.$on('isUpdatingValue', (status) => {
+        eventBusItemMetadata.$on('isUpdatingValue', (status) => {
             this.isUpdatingValues = status;
         });
-        eventBus.$on('hasErrorsOnForm', (hasErrors) => {
+        eventBusItemMetadata.$on('hasErrorsOnForm', (hasErrors) => {
             if (hasErrors)
                 this.formErrorMessage = this.$i18n.get('info_errors_in_form');
             else
@@ -1390,8 +1390,8 @@ export default {
         this.cleanLastUpdated();
     },
     beforeDestroy () {
-        eventBus.$off('isUpdatingValue');
-        eventBus.$off('hasErrorsOnForm');
+        eventBusItemMetadata.$off('isUpdatingValue');
+        eventBusItemMetadata.$off('hasErrorsOnForm');
     },
     beforeRouteLeave ( to, from, next ) {
         if (this.item.status == 'auto-draft') {
diff --git a/src/front/admin/components/lists/activities-list.vue b/src/front/admin/components/lists/activities-list.vue
index 8d1be9e00..fa189fed3 100644
--- a/src/front/admin/components/lists/activities-list.vue
+++ b/src/front/admin/components/lists/activities-list.vue
@@ -129,7 +129,7 @@
 <script>
     import { mapActions } from 'vuex';
 
-    import ActivityDetailsModal from '../other/activity-details-modal.vue';
+    import ActivityDetailsModal from '../modals/activity-details-modal.vue';
     import ThreeStateToggleButton from '../other/three-state-toggle-button.vue';
 
     export default {
diff --git a/src/front/admin/components/lists/capabilities-list.vue b/src/front/admin/components/lists/capabilities-list.vue
index b13038da6..e7aa23b90 100644
--- a/src/front/admin/components/lists/capabilities-list.vue
+++ b/src/front/admin/components/lists/capabilities-list.vue
@@ -117,7 +117,7 @@
 </template>
 
 <script>
-    import CapabilityEditionModal from '../other/capability-edition-modal.vue';
+    import CapabilityEditionModal from '../modals/capability-edition-modal.vue';
 
     // Auxiliary component for avoinding multiple calls to getCompleteRolesList
     const CompleteRolesList = {
diff --git a/src/front/admin/components/lists/items-list.vue b/src/front/admin/components/lists/items-list.vue
index 51b7c2881..adde41517 100644
--- a/src/front/admin/components/lists/items-list.vue
+++ b/src/front/admin/components/lists/items-list.vue
@@ -918,7 +918,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 BulkEditionModal from '../modals/bulk-edition-modal.vue';
 import { dateInter } from "../../js/mixins";
 
 export default {
diff --git a/src/front/admin/components/other/activity-details-modal.vue b/src/front/admin/components/modals/activity-details-modal.vue
similarity index 99%
rename from src/front/admin/components/other/activity-details-modal.vue
rename to src/front/admin/components/modals/activity-details-modal.vue
index cb9f704db..e3ebf18cd 100644
--- a/src/front/admin/components/other/activity-details-modal.vue
+++ b/src/front/admin/components/modals/activity-details-modal.vue
@@ -607,7 +607,7 @@
 <script>
     import { mapActions, mapGetters } from 'vuex';
     import moment from 'moment';
-    import FileItem from './file-item.vue';
+    import FileItem from '../other/file-item.vue';
 
     export default {
         name: "ActivityDetailsModal",
diff --git a/src/front/admin/components/other/available-exporters-modal.vue b/src/front/admin/components/modals/available-exporters-modal.vue
similarity index 100%
rename from src/front/admin/components/other/available-exporters-modal.vue
rename to src/front/admin/components/modals/available-exporters-modal.vue
diff --git a/src/front/admin/components/other/available-importers-modal.vue b/src/front/admin/components/modals/available-importers-modal.vue
similarity index 100%
rename from src/front/admin/components/other/available-importers-modal.vue
rename to src/front/admin/components/modals/available-importers-modal.vue
diff --git a/src/front/admin/components/bulk-edition/bulk-edition-modal.vue b/src/front/admin/components/modals/bulk-edition-modal.vue
similarity index 100%
rename from src/front/admin/components/bulk-edition/bulk-edition-modal.vue
rename to src/front/admin/components/modals/bulk-edition-modal.vue
diff --git a/src/front/admin/components/other/capability-edition-modal.vue b/src/front/admin/components/modals/capability-edition-modal.vue
similarity index 100%
rename from src/front/admin/components/other/capability-edition-modal.vue
rename to src/front/admin/components/modals/capability-edition-modal.vue
diff --git a/src/front/admin/components/other/checkbox-radio-modal.vue b/src/front/admin/components/modals/checkbox-radio-modal.vue
similarity index 100%
rename from src/front/admin/components/other/checkbox-radio-modal.vue
rename to src/front/admin/components/modals/checkbox-radio-modal.vue
diff --git a/src/front/admin/components/other/collections-modal.vue b/src/front/admin/components/modals/collections-modal.vue
similarity index 100%
rename from src/front/admin/components/other/collections-modal.vue
rename to src/front/admin/components/modals/collections-modal.vue
diff --git a/src/front/admin/components/other/exposers-modal.vue b/src/front/admin/components/modals/exposers-modal.vue
similarity index 100%
rename from src/front/admin/components/other/exposers-modal.vue
rename to src/front/admin/components/modals/exposers-modal.vue
diff --git a/src/front/admin/components/navigation/tainacan-header.vue b/src/front/admin/components/navigation/tainacan-header.vue
index e4cf48123..e536309ef 100644
--- a/src/front/admin/components/navigation/tainacan-header.vue
+++ b/src/front/admin/components/navigation/tainacan-header.vue
@@ -126,7 +126,7 @@
 </template>
 
 <script>
-    import AdvancedSearch from '../advanced-search/advanced-search.vue';
+    import AdvancedSearch from '../search/advanced-search.vue';
     import ProcessesPopup from '../other/processes-popup.vue';
 
     export default {
diff --git a/src/front/admin/components/navigation/tainacan-repository-subheader.vue b/src/front/admin/components/navigation/tainacan-repository-subheader.vue
index 08c947f6c..2c861671d 100644
--- a/src/front/admin/components/navigation/tainacan-repository-subheader.vue
+++ b/src/front/admin/components/navigation/tainacan-repository-subheader.vue
@@ -82,7 +82,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import AvailableExportersModal from '../other/available-exporters-modal.vue';
+import AvailableExportersModal from '../modals/available-exporters-modal.vue';
 
 export default {
     name: 'TainacanRepositorySubheader',
diff --git a/src/front/admin/components/repository/collection-filter/collection-filter.vue b/src/front/admin/components/other/collection-filter.vue
similarity index 100%
rename from src/front/admin/components/repository/collection-filter/collection-filter.vue
rename to src/front/admin/components/other/collection-filter.vue
diff --git a/src/front/admin/components/other/item-copy-dialog.vue b/src/front/admin/components/other/item-copy-dialog.vue
index 54520a57a..6f2da15e2 100644
--- a/src/front/admin/components/other/item-copy-dialog.vue
+++ b/src/front/admin/components/other/item-copy-dialog.vue
@@ -93,7 +93,7 @@
 
 <script>
     import { mapActions } from 'vuex';
-    import BulkEditionModal from '../bulk-edition/bulk-edition-modal.vue';
+    import BulkEditionModal from '../modals/bulk-edition-modal.vue';
 
     export default {
         name: 'ItemCopyDialog',
diff --git a/src/front/admin/components/advanced-search/advanced-search.vue b/src/front/admin/components/search/advanced-search.vue
similarity index 100%
rename from src/front/admin/components/advanced-search/advanced-search.vue
rename to src/front/admin/components/search/advanced-search.vue
diff --git a/src/front/admin/components/search/filters-items-list.vue b/src/front/admin/components/search/filters-items-list.vue
index fc35b9a4e..ac8883378 100644
--- a/src/front/admin/components/search/filters-items-list.vue
+++ b/src/front/admin/components/search/filters-items-list.vue
@@ -198,7 +198,7 @@
 
 <script>
     import { mapGetters, mapActions } from 'vuex';
-    import CollectionsFilter from '../repository/collection-filter/collection-filter.vue';
+    import CollectionsFilter from '../other/collection-filter.vue';
 
     export default {
         data() {
diff --git a/src/front/admin/js/event-bus-web-components.js b/src/front/admin/js/event-bus-item-metadata.js
similarity index 98%
rename from src/front/admin/js/event-bus-web-components.js
rename to src/front/admin/js/event-bus-item-metadata.js
index be06ea339..48561e339 100644
--- a/src/front/admin/js/event-bus-web-components.js
+++ b/src/front/admin/js/event-bus-item-metadata.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import store from './store/store'
 
-export const eventBus = new Vue({
+export const eventBusItemMetadata = new Vue({
     store,
     data: {
         errors : []
diff --git a/src/front/admin/pages/lists/collections-page.vue b/src/front/admin/pages/lists/collections-page.vue
index 9e9c37326..9815a8443 100644
--- a/src/front/admin/pages/lists/collections-page.vue
+++ b/src/front/admin/pages/lists/collections-page.vue
@@ -315,7 +315,7 @@
 
 <script>
 import CollectionsList from '../../components/lists/collections-list.vue';
-import AvailableImportersModal from '../../components/other/available-importers-modal.vue';
+import AvailableImportersModal from '../../components/modals/available-importers-modal.vue';
 import { mapActions, mapGetters } from 'vuex';
 
 export default {
diff --git a/src/front/admin/pages/lists/items-page.vue b/src/front/admin/pages/lists/items-page.vue
index 1042426bb..cfc1b90e5 100644
--- a/src/front/admin/pages/lists/items-page.vue
+++ b/src/front/admin/pages/lists/items-page.vue
@@ -901,10 +901,10 @@
     import FiltersTagsList from '../../components/search/filters-tags-list.vue';
     import FiltersItemsList from '../../components/search/filters-items-list.vue';
     import Pagination from '../../components/search/pagination.vue'
-    import AdvancedSearch from '../../components/advanced-search/advanced-search.vue';
-    import AvailableImportersModal from '../../components/other/available-importers-modal.vue';
-    import ExposersModal from '../../components/other/exposers-modal.vue';
-    import CollectionsModal from '../../components/other/collections-modal.vue';
+    import AdvancedSearch from '../../components/search/advanced-search.vue';
+    import AvailableImportersModal from '../../components/modals/available-importers-modal.vue';
+    import ExposersModal from '../../components/modals/exposers-modal.vue';
+    import CollectionsModal from '../../components/modals/collections-modal.vue';
     import CustomDialog from '../../components/other/custom-dialog.vue';
     import { mapActions, mapGetters } from 'vuex';
 
diff --git a/src/front/admin/pages/lists/term-items-page.vue b/src/front/admin/pages/lists/term-items-page.vue
index d3d04d2a4..b7b7d82a0 100644
--- a/src/front/admin/pages/lists/term-items-page.vue
+++ b/src/front/admin/pages/lists/term-items-page.vue
@@ -870,9 +870,9 @@
     import FiltersTagsList from '../../components/search/filters-tags-list.vue';
     import FiltersItemsList from '../../components/search/filters-items-list.vue';
     import Pagination from '../../components/search/pagination.vue'
-    import AdvancedSearch from '../../components/advanced-search/advanced-search.vue';
-    import ExposersModal from '../../components/other/exposers-modal.vue';
-    import AvailableImportersModal from '../../components/other/available-importers-modal.vue';
+    import AdvancedSearch from '../../components/search/advanced-search.vue';
+    import ExposersModal from '../../components/modals/exposers-modal.vue';
+    import AvailableImportersModal from '../../components/modals/available-importers-modal.vue';
     import CustomDialog from '../../components/other/custom-dialog.vue';
     import { mapActions, mapGetters } from 'vuex';
 
diff --git a/src/front/admin/pages/singles/item-page.vue b/src/front/admin/pages/singles/item-page.vue
index 539ca9475..c513d2b4e 100644
--- a/src/front/admin/pages/singles/item-page.vue
+++ b/src/front/admin/pages/singles/item-page.vue
@@ -313,7 +313,7 @@
     import DocumentItem from '../../components/other/document-item.vue';
     import {formHooks} from '../../js/mixins';
     import ActivitiesPage from '../lists/activities-page.vue';
-    import ExposersModal from '../../components/other/exposers-modal.vue';
+    import ExposersModal from '../../components/modals/exposers-modal.vue';
     import AttachmentsList from '../../components/lists/attachments-list.vue';
 
     export default {