diff --git a/src/api/class-tainacan-rest-controller.php b/src/classes/api/class-tainacan-rest-controller.php
similarity index 100%
rename from src/api/class-tainacan-rest-controller.php
rename to src/classes/api/class-tainacan-rest-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-background-processes-controller.php b/src/classes/api/endpoints/class-tainacan-rest-background-processes-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-background-processes-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-background-processes-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php b/src/classes/api/endpoints/class-tainacan-rest-bulkedit-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-bulkedit-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-bulkedit-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-collections-controller.php b/src/classes/api/endpoints/class-tainacan-rest-collections-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-collections-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-collections-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-exporters-controller.php b/src/classes/api/endpoints/class-tainacan-rest-exporters-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-exporters-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-exporters-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-exposers-controller.php b/src/classes/api/endpoints/class-tainacan-rest-exposers-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-exposers-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-exposers-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-facets-controller.php b/src/classes/api/endpoints/class-tainacan-rest-facets-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-facets-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-facets-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-filter-types-controller.php b/src/classes/api/endpoints/class-tainacan-rest-filter-types-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-filter-types-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-filter-types-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-filters-controller.php b/src/classes/api/endpoints/class-tainacan-rest-filters-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-filters-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-filters-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-importers-controller.php b/src/classes/api/endpoints/class-tainacan-rest-importers-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-importers-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-importers-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php b/src/classes/api/endpoints/class-tainacan-rest-item-metadata-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-item-metadata-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-item-metadata-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-items-controller.php b/src/classes/api/endpoints/class-tainacan-rest-items-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-items-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-items-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-logs-controller.php b/src/classes/api/endpoints/class-tainacan-rest-logs-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-logs-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-logs-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-metadata-controller.php b/src/classes/api/endpoints/class-tainacan-rest-metadata-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-metadata-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-metadata-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-metadata-types-controller.php b/src/classes/api/endpoints/class-tainacan-rest-metadata-types-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-metadata-types-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-metadata-types-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-metadatum-mappers-controller.php b/src/classes/api/endpoints/class-tainacan-rest-metadatum-mappers-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-metadatum-mappers-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-metadatum-mappers-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-oaipmh-expose-controller.php b/src/classes/api/endpoints/class-tainacan-rest-oaipmh-expose-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-oaipmh-expose-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-oaipmh-expose-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-roles-controller.php b/src/classes/api/endpoints/class-tainacan-rest-roles-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-roles-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-roles-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-sequence-edit-controller.php b/src/classes/api/endpoints/class-tainacan-rest-sequence-edit-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-sequence-edit-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-sequence-edit-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php b/src/classes/api/endpoints/class-tainacan-rest-taxonomies-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-taxonomies-controller.php
diff --git a/src/api/endpoints/class-tainacan-rest-terms-controller.php b/src/classes/api/endpoints/class-tainacan-rest-terms-controller.php
similarity index 100%
rename from src/api/endpoints/class-tainacan-rest-terms-controller.php
rename to src/classes/api/endpoints/class-tainacan-rest-terms-controller.php
diff --git a/src/api/tainacan-rest-creator.php b/src/classes/api/tainacan-rest-creator.php
similarity index 100%
rename from src/api/tainacan-rest-creator.php
rename to src/classes/api/tainacan-rest-creator.php
diff --git a/src/exporter/class-tainacan-bg-exporter.php b/src/classes/background-processes/exporter/class-tainacan-bg-exporter.php
similarity index 100%
rename from src/exporter/class-tainacan-bg-exporter.php
rename to src/classes/background-processes/exporter/class-tainacan-bg-exporter.php
diff --git a/src/exporter/class-tainacan-csv.php b/src/classes/background-processes/exporter/class-tainacan-csv.php
similarity index 100%
rename from src/exporter/class-tainacan-csv.php
rename to src/classes/background-processes/exporter/class-tainacan-csv.php
diff --git a/src/exporter/class-tainacan-export-handler.php b/src/classes/background-processes/exporter/class-tainacan-export-handler.php
similarity index 100%
rename from src/exporter/class-tainacan-export-handler.php
rename to src/classes/background-processes/exporter/class-tainacan-export-handler.php
diff --git a/src/exporter/class-tainacan-exporter.php b/src/classes/background-processes/exporter/class-tainacan-exporter.php
similarity index 100%
rename from src/exporter/class-tainacan-exporter.php
rename to src/classes/background-processes/exporter/class-tainacan-exporter.php
diff --git a/src/exporter/class-tainacan-term-exporter.php b/src/classes/background-processes/exporter/class-tainacan-term-exporter.php
similarity index 100%
rename from src/exporter/class-tainacan-term-exporter.php
rename to src/classes/background-processes/exporter/class-tainacan-term-exporter.php
diff --git a/src/generic-background-process/class-tainacan-bg-generic.php b/src/classes/background-processes/generic-background-process/class-tainacan-bg-generic.php
similarity index 100%
rename from src/generic-background-process/class-tainacan-bg-generic.php
rename to src/classes/background-processes/generic-background-process/class-tainacan-bg-generic.php
diff --git a/src/generic-background-process/class-tainacan-bulk-edit-process.php b/src/classes/background-processes/generic-background-process/class-tainacan-bulk-edit-process.php
similarity index 100%
rename from src/generic-background-process/class-tainacan-bulk-edit-process.php
rename to src/classes/background-processes/generic-background-process/class-tainacan-bulk-edit-process.php
diff --git a/src/generic-background-process/class-tainacan-generic-handler.php b/src/classes/background-processes/generic-background-process/class-tainacan-generic-handler.php
similarity index 100%
rename from src/generic-background-process/class-tainacan-generic-handler.php
rename to src/classes/background-processes/generic-background-process/class-tainacan-generic-handler.php
diff --git a/src/generic-background-process/class-tainacan-generic-process.php b/src/classes/background-processes/generic-background-process/class-tainacan-generic-process.php
similarity index 100%
rename from src/generic-background-process/class-tainacan-generic-process.php
rename to src/classes/background-processes/generic-background-process/class-tainacan-generic-process.php
diff --git a/src/importer/class-tainacan-bg-importer.php b/src/classes/background-processes/importer/class-tainacan-bg-importer.php
similarity index 100%
rename from src/importer/class-tainacan-bg-importer.php
rename to src/classes/background-processes/importer/class-tainacan-bg-importer.php
diff --git a/src/importer/class-tainacan-csv.php b/src/classes/background-processes/importer/class-tainacan-csv.php
similarity index 100%
rename from src/importer/class-tainacan-csv.php
rename to src/classes/background-processes/importer/class-tainacan-csv.php
diff --git a/src/importer/class-tainacan-flickr-importer.php b/src/classes/background-processes/importer/class-tainacan-flickr-importer.php
similarity index 100%
rename from src/importer/class-tainacan-flickr-importer.php
rename to src/classes/background-processes/importer/class-tainacan-flickr-importer.php
diff --git a/src/importer/class-tainacan-importer-handler.php b/src/classes/background-processes/importer/class-tainacan-importer-handler.php
similarity index 100%
rename from src/importer/class-tainacan-importer-handler.php
rename to src/classes/background-processes/importer/class-tainacan-importer-handler.php
diff --git a/src/importer/class-tainacan-importer.php b/src/classes/background-processes/importer/class-tainacan-importer.php
similarity index 100%
rename from src/importer/class-tainacan-importer.php
rename to src/classes/background-processes/importer/class-tainacan-importer.php
diff --git a/src/importer/class-tainacan-oaipmh-importer.php b/src/classes/background-processes/importer/class-tainacan-oaipmh-importer.php
similarity index 100%
rename from src/importer/class-tainacan-oaipmh-importer.php
rename to src/classes/background-processes/importer/class-tainacan-oaipmh-importer.php
diff --git a/src/importer/class-tainacan-old-tainacan.php b/src/classes/background-processes/importer/class-tainacan-old-tainacan.php
similarity index 100%
rename from src/importer/class-tainacan-old-tainacan.php
rename to src/classes/background-processes/importer/class-tainacan-old-tainacan.php
diff --git a/src/importer/class-tainacan-test-importer.php b/src/classes/background-processes/importer/class-tainacan-test-importer.php
similarity index 100%
rename from src/importer/class-tainacan-test-importer.php
rename to src/classes/background-processes/importer/class-tainacan-test-importer.php
diff --git a/src/importer/class-tainacan-youtube-importer.php b/src/classes/background-processes/importer/class-tainacan-youtube-importer.php
similarity index 100%
rename from src/importer/class-tainacan-youtube-importer.php
rename to src/classes/background-processes/importer/class-tainacan-youtube-importer.php
diff --git a/src/importer/import.php b/src/classes/background-processes/importer/import.php
similarity index 100%
rename from src/importer/import.php
rename to src/classes/background-processes/importer/import.php
diff --git a/src/importer/term-importer/class-tainacan-term-importer.php b/src/classes/background-processes/importer/term-importer/class-tainacan-term-importer.php
similarity index 100%
rename from src/importer/term-importer/class-tainacan-term-importer.php
rename to src/classes/background-processes/importer/term-importer/class-tainacan-term-importer.php
diff --git a/src/importer/term-importer/js/term.js b/src/classes/background-processes/importer/term-importer/js/term.js
similarity index 100%
rename from src/importer/term-importer/js/term.js
rename to src/classes/background-processes/importer/term-importer/js/term.js
diff --git a/src/cli/class-tainacan-cli-collection.php b/src/classes/cli/class-tainacan-cli-collection.php
similarity index 100%
rename from src/cli/class-tainacan-cli-collection.php
rename to src/classes/cli/class-tainacan-cli-collection.php
diff --git a/src/cli/class-tainacan-cli-document.php b/src/classes/cli/class-tainacan-cli-document.php
similarity index 100%
rename from src/cli/class-tainacan-cli-document.php
rename to src/classes/cli/class-tainacan-cli-document.php
diff --git a/src/cli/class-tainacan-cli-garbage-collector.php b/src/classes/cli/class-tainacan-cli-garbage-collector.php
similarity index 100%
rename from src/cli/class-tainacan-cli-garbage-collector.php
rename to src/classes/cli/class-tainacan-cli-garbage-collector.php
diff --git a/src/cli/class-tainacan-cli-move-attachments.php b/src/classes/cli/class-tainacan-cli-move-attachments.php
similarity index 100%
rename from src/cli/class-tainacan-cli-move-attachments.php
rename to src/classes/cli/class-tainacan-cli-move-attachments.php
diff --git a/src/cli/class-tainacan-cli.php b/src/classes/cli/class-tainacan-cli.php
similarity index 100%
rename from src/cli/class-tainacan-cli.php
rename to src/classes/cli/class-tainacan-cli.php
diff --git a/src/exposers/class-tainacan-csv.php b/src/classes/exposers/class-tainacan-csv.php
similarity index 100%
rename from src/exposers/class-tainacan-csv.php
rename to src/classes/exposers/class-tainacan-csv.php
diff --git a/src/exposers/class-tainacan-exposer.php b/src/classes/exposers/class-tainacan-exposer.php
similarity index 100%
rename from src/exposers/class-tainacan-exposer.php
rename to src/classes/exposers/class-tainacan-exposer.php
diff --git a/src/exposers/class-tainacan-exposers-handler.php b/src/classes/exposers/class-tainacan-exposers-handler.php
similarity index 100%
rename from src/exposers/class-tainacan-exposers-handler.php
rename to src/classes/exposers/class-tainacan-exposers-handler.php
diff --git a/src/exposers/class-tainacan-html.php b/src/classes/exposers/class-tainacan-html.php
similarity index 100%
rename from src/exposers/class-tainacan-html.php
rename to src/classes/exposers/class-tainacan-html.php
diff --git a/src/exposers/class-tainacan-json-ld.php b/src/classes/exposers/class-tainacan-json-ld.php
similarity index 100%
rename from src/exposers/class-tainacan-json-ld.php
rename to src/classes/exposers/class-tainacan-json-ld.php
diff --git a/src/exposers/class-tainacan-oai-pmh.php b/src/classes/exposers/class-tainacan-oai-pmh.php
similarity index 100%
rename from src/exposers/class-tainacan-oai-pmh.php
rename to src/classes/exposers/class-tainacan-oai-pmh.php
diff --git a/src/exposers/class-tainacan-txt.php b/src/classes/exposers/class-tainacan-txt.php
similarity index 100%
rename from src/exposers/class-tainacan-txt.php
rename to src/classes/exposers/class-tainacan-txt.php
diff --git a/src/exposers/class-tainacan-xml.php b/src/classes/exposers/class-tainacan-xml.php
similarity index 100%
rename from src/exposers/class-tainacan-xml.php
rename to src/classes/exposers/class-tainacan-xml.php
diff --git a/src/mappers/class-tainacan-dublin-core.php b/src/classes/mappers/class-tainacan-dublin-core.php
similarity index 100%
rename from src/mappers/class-tainacan-dublin-core.php
rename to src/classes/mappers/class-tainacan-dublin-core.php
diff --git a/src/mappers/class-tainacan-mapper.php b/src/classes/mappers/class-tainacan-mapper.php
similarity index 100%
rename from src/mappers/class-tainacan-mapper.php
rename to src/classes/mappers/class-tainacan-mapper.php
diff --git a/src/mappers/class-tainacan-mappers-handler.php b/src/classes/mappers/class-tainacan-mappers-handler.php
similarity index 100%
rename from src/mappers/class-tainacan-mappers-handler.php
rename to src/classes/mappers/class-tainacan-mappers-handler.php
diff --git a/src/oaipmh-expose/class-tainacan-oaipmh-expose.php b/src/classes/oaipmh/class-tainacan-oaipmh-expose.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-oaipmh-expose.php
rename to src/classes/oaipmh/class-tainacan-oaipmh-expose.php
diff --git a/src/oaipmh-expose/class-tainacan-oaipmh-get-record.php b/src/classes/oaipmh/class-tainacan-oaipmh-get-record.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-oaipmh-get-record.php
rename to src/classes/oaipmh/class-tainacan-oaipmh-get-record.php
diff --git a/src/oaipmh-expose/class-tainacan-oaipmh-identify.php b/src/classes/oaipmh/class-tainacan-oaipmh-identify.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-oaipmh-identify.php
rename to src/classes/oaipmh/class-tainacan-oaipmh-identify.php
diff --git a/src/oaipmh-expose/class-tainacan-oaipmh-list-identifiers.php b/src/classes/oaipmh/class-tainacan-oaipmh-list-identifiers.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-oaipmh-list-identifiers.php
rename to src/classes/oaipmh/class-tainacan-oaipmh-list-identifiers.php
diff --git a/src/oaipmh-expose/class-tainacan-oaipmh-list-metadata-formats.php b/src/classes/oaipmh/class-tainacan-oaipmh-list-metadata-formats.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-oaipmh-list-metadata-formats.php
rename to src/classes/oaipmh/class-tainacan-oaipmh-list-metadata-formats.php
diff --git a/src/oaipmh-expose/class-tainacan-oaipmh-list-records.php b/src/classes/oaipmh/class-tainacan-oaipmh-list-records.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-oaipmh-list-records.php
rename to src/classes/oaipmh/class-tainacan-oaipmh-list-records.php
diff --git a/src/oaipmh-expose/class-tainacan-oaipmh-list-sets.php b/src/classes/oaipmh/class-tainacan-oaipmh-list-sets.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-oaipmh-list-sets.php
rename to src/classes/oaipmh/class-tainacan-oaipmh-list-sets.php
diff --git a/src/oaipmh-expose/class-tainacan-xml-create.php b/src/classes/oaipmh/class-tainacan-xml-create.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-xml-create.php
rename to src/classes/oaipmh/class-tainacan-xml-create.php
diff --git a/src/oaipmh-expose/class-tainacan-xml-error.php b/src/classes/oaipmh/class-tainacan-xml-error.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-xml-error.php
rename to src/classes/oaipmh/class-tainacan-xml-error.php
diff --git a/src/oaipmh-expose/class-tainacan-xml-response.php b/src/classes/oaipmh/class-tainacan-xml-response.php
similarity index 100%
rename from src/oaipmh-expose/class-tainacan-xml-response.php
rename to src/classes/oaipmh/class-tainacan-xml-response.php
diff --git a/src/classes/tainacan-creator.php b/src/classes/tainacan-creator.php
index 79d0682b3..7c010d412 100644
--- a/src/classes/tainacan-creator.php
+++ b/src/classes/tainacan-creator.php
@@ -1,20 +1,20 @@
 <?php
 
-const TAINACAN_CLI_DIR                    = __DIR__ . '/../cli/';
-const TAINACAN_TAPI_DIR                   = __DIR__ . '/../api/';
-const TAINACAN_OAIPMH_DIR                 = __DIR__ . '/../oaipmh-expose/';
+const TAINACAN_CLI_DIR                    = __DIR__ . '/cli/';
+const TAINACAN_TAPI_DIR                   = __DIR__ . '/api/';
+const TAINACAN_OAIPMH_DIR                 = __DIR__ . '/oaipmh/';
 const TAINACAN_TRAITS_DIR                 = __DIR__ . '/traits/';
 const TAINACAN_VENDOR_DIR                 = __DIR__ . '/../vendor/';
-const TAINACAN_MAPPERS_DIR                = __DIR__ . '/../mappers/';
+const TAINACAN_MAPPERS_DIR                = __DIR__ . '/mappers/';
 const TAINACAN_ENTITIES_DIR               = __DIR__ . '/entities/';
-const TAINACAN_IMPORTER_DIR               = __DIR__ . '/../importer/';
-const TAINACAN_EXPORTER_DIR               = __DIR__ . '/../exporter/';
-const TAINACAN_EXPOSERS_DIR               = __DIR__ . '/../exposers/';
+const TAINACAN_IMPORTER_DIR               = __DIR__ . '/background-processes/importer/';
+const TAINACAN_EXPORTER_DIR               = __DIR__ . '/background-processes/exporter/';
+const TAINACAN_EXPOSERS_DIR               = __DIR__ . '/exposers/';
 const TAINACAN_ENDPOINTS_DIR              = __DIR__ . '/../api/endpoints/';
 const TAINACAN_FILTER_TYPES_DIR           = __DIR__ . '/../views/admin/components/filter-types/';
 const TAINACAN_REPOSITORIES_DIR           = __DIR__ . '/repositories/';
 const TAINACAN_METADATA_TYPES_DIR         = __DIR__ . '/../views/admin/components/metadata-types/';
-const TAINACAN_GENERIC_BACKGROUND_PROCESS = __DIR__ . '/../generic-background-process/';
+const TAINACAN_GENERIC_BACKGROUND_PROCESS = __DIR__ . '/background-processes/generic-background-process/';
 
 const DIRS = [
 	TAINACAN_CLI_DIR,
@@ -38,14 +38,16 @@ require_once('libs/wp-async-request.php');
 require_once('libs/wp-background-process.php');
 require_once('class-tainacan-background-process.php');
 require_once('tainacan-utils.php');
-require_once(TAINACAN_IMPORTER_DIR . 'class-tainacan-bg-importer.php');
 
 require_once(TAINACAN_VENDOR_DIR . 'autoload.php');
-require_once(TAINACAN_IMPORTER_DIR . 'class-tainacan-importer.php');
-require_once(TAINACAN_IMPORTER_DIR . 'class-tainacan-importer-handler.php');
+
 require_once(TAINACAN_EXPOSERS_DIR . 'class-tainacan-exposers-handler.php');
 require_once(TAINACAN_MAPPERS_DIR . 'class-tainacan-mappers-handler.php');
 
+require_once(TAINACAN_IMPORTER_DIR . 'class-tainacan-bg-importer.php');
+require_once(TAINACAN_IMPORTER_DIR . 'class-tainacan-importer.php');
+require_once(TAINACAN_IMPORTER_DIR . 'class-tainacan-importer-handler.php');
+
 require_once(TAINACAN_EXPORTER_DIR . 'class-tainacan-bg-exporter.php');
 require_once(TAINACAN_EXPORTER_DIR . 'class-tainacan-export-handler.php');
 
@@ -55,7 +57,7 @@ require_once(TAINACAN_GENERIC_BACKGROUND_PROCESS . 'class-tainacan-generic-handl
 
 spl_autoload_register('tainacan_autoload');
 
-function tainacan_autoload($class_name){
+function tainacan_autoload($class_name) {
 	$class_path = explode('\\', $class_name);
 	$class_name = end($class_path);
 
@@ -177,8 +179,8 @@ require_once(__DIR__ . '/../views/class-tainacan-admin-hooks.php');
 require_once(__DIR__ . '/../views/admin-hooks-functions.php');
 $Tainacan_Admin_Hooks = \Tainacan\Admin_Hooks::get_instance();
 
-require_once(__DIR__ . '/../theme-helper/class-tainacan-theme-helper.php');
-require_once(__DIR__ . '/../theme-helper/template-tags.php');
+require_once(__DIR__ . '/theme-helper/class-tainacan-theme-helper.php');
+require_once(__DIR__ . '/theme-helper/template-tags.php');
 $Tainacan_Theme_Helper = \Tainacan\Theme_Helper::get_instance();
 
 require_once(__DIR__ . '/../views/gutenberg-blocks/class-tainacan-gutenberg-block.php');
diff --git a/src/theme-helper/class-tainacan-theme-helper.php b/src/classes/theme-helper/class-tainacan-theme-helper.php
similarity index 100%
rename from src/theme-helper/class-tainacan-theme-helper.php
rename to src/classes/theme-helper/class-tainacan-theme-helper.php
diff --git a/src/theme-helper/template-tags.php b/src/classes/theme-helper/template-tags.php
similarity index 100%
rename from src/theme-helper/template-tags.php
rename to src/classes/theme-helper/template-tags.php
diff --git a/src/tainacan.php b/src/tainacan.php
index 299fd315d..7ef1190e3 100644
--- a/src/tainacan.php
+++ b/src/tainacan.php
@@ -15,7 +15,7 @@ const TAINACAN_VERSION = '0.14.2';
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 $TAINACAN_BASE_URL = plugins_url('', __FILE__);
 const TAINACAN_BASE_DIR     = __DIR__;
-const TAINACAN_API_DIR     = __DIR__ . '/api/';
+const TAINACAN_API_DIR     = __DIR__ . '/classes/api/';
 const TAINACAN_CLASSES_DIR = __DIR__ . '/classes/';
 $TAINACAN_API_MAX_ITEMS_PER_PAGE = defined('TAINACAN_API_MAX_ITEMS_PER_PAGE') ? TAINACAN_API_MAX_ITEMS_PER_PAGE : 96;
 require_once(TAINACAN_CLASSES_DIR . 'tainacan-creator.php');