diff --git a/pom.xml b/pom.xml
index 301fb6d9..1588ad33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
         <version>3.2.12</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>org.fairdatapoint</groupId>
+    <groupId>org.fairdatateam.fairdatapoint</groupId>
     <artifactId>fairdatapoint</artifactId>
     <version>1.17.3</version>
     <packaging>jar</packaging>
@@ -330,7 +330,7 @@
                         </goals>
                         <configuration>
                             <classifier>spring-boot</classifier>
-                            <mainClass>org.fairdatapoint.Application</mainClass>
+                            <mainClass>org.fairdatateam.fairdatapoint.Application</mainClass>
                         </configuration>
                     </execution>
                     <execution>
@@ -431,7 +431,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <package>org.fairdatapoint.vocabulary</package>
+                    <package>org.fairdatateam.fairdatapoint.vocabulary</package>
                     <addGeneratedAnnotation>false</addGeneratedAnnotation>
                     <vocabularies>
                         <vocabulary>
diff --git a/src/main/java/org/fairdatapoint/Application.java b/src/main/java/org/fairdatateam/fairdatapoint/Application.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/Application.java
rename to src/main/java/org/fairdatateam/fairdatapoint/Application.java
index f7f26799..8cbacb7f 100644
--- a/src/main/java/org/fairdatapoint/Application.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/Application.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint;
+package org.fairdatateam.fairdatapoint;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -31,7 +31,7 @@
 @SpringBootApplication
 @EnableWebMvc
 @EnableAsync
-@ConfigurationPropertiesScan("org.fairdatapoint.config.*")
+@ConfigurationPropertiesScan("org.fairdatateam.fairdatapoint.config.*")
 public class Application {
 
     private static final String PROFILES_PROPERTY = "spring.profiles.active";
diff --git a/src/main/java/org/fairdatapoint/Profiles.java b/src/main/java/org/fairdatateam/fairdatapoint/Profiles.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/Profiles.java
rename to src/main/java/org/fairdatateam/fairdatapoint/Profiles.java
index a87da27d..67af0b5c 100644
--- a/src/main/java/org/fairdatapoint/Profiles.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/Profiles.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint;
+package org.fairdatateam.fairdatapoint;
 
 public class Profiles {
 
diff --git a/src/main/java/org/fairdatapoint/api/controller/apikey/ApiKeyController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/apikey/ApiKeyController.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/controller/apikey/ApiKeyController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/apikey/ApiKeyController.java
index 43b5f5a9..5ad8e0dc 100644
--- a/src/main/java/org/fairdatapoint/api/controller/apikey/ApiKeyController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/apikey/ApiKeyController.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.apikey;
+package org.fairdatateam.fairdatapoint.api.controller.apikey;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.service.apikey.ApiKeyService;
+import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.service.apikey.ApiKeyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/config/ConfigController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/config/ConfigController.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/controller/config/ConfigController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/config/ConfigController.java
index 963f79ff..0f90b7c0 100644
--- a/src/main/java/org/fairdatapoint/api/controller/config/ConfigController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/config/ConfigController.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.config;
+package org.fairdatateam.fairdatapoint.api.controller.config;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.api.dto.config.BootstrapConfigDTO;
-import org.fairdatapoint.service.config.ConfigService;
+import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO;
+import org.fairdatateam.fairdatapoint.service.config.ConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/dashboard/DashboardController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java
similarity index 82%
rename from src/main/java/org/fairdatapoint/api/controller/dashboard/DashboardController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java
index 32ef5e7a..56670afa 100644
--- a/src/main/java/org/fairdatapoint/api/controller/dashboard/DashboardController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/dashboard/DashboardController.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.dashboard;
+package org.fairdatateam.fairdatapoint.api.controller.dashboard;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
-import org.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
-import org.fairdatapoint.service.dashboard.DashboardService;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
+import org.fairdatateam.fairdatapoint.service.dashboard.DashboardService;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -39,9 +39,9 @@
 
 import java.util.List;
 
-import static org.fairdatapoint.util.HttpUtil.getRequestURL;
-import static org.fairdatapoint.util.RdfUtil.removeLastPartOfIRI;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRequestURL;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.removeLastPartOfIRI;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Client")
 @RestController
diff --git a/src/main/java/org/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
index bd06b24f..87d2b715 100644
--- a/src/main/java/org/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
@@ -25,17 +25,18 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.api.controller.exception;
+package org.fairdatateam.fairdatapoint.api.controller.exception;
 
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.entity.exception.*;
-import org.fairdatapoint.entity.index.exception.AbstractIndexException;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.*;
+import org.fairdatateam.fairdatapoint.entity.exception.*;
+import org.fairdatateam.fairdatapoint.entity.index.exception.AbstractIndexException;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.query.MalformedQueryException;
@@ -57,8 +58,8 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.RdfIOUtil.getWriterConfig;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.getWriterConfig;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @ControllerAdvice
 @Slf4j
diff --git a/src/main/java/org/fairdatapoint/api/controller/form/FormAutocompleteController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/form/FormAutocompleteController.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/api/controller/form/FormAutocompleteController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/form/FormAutocompleteController.java
index d49226f6..c3bb11f5 100644
--- a/src/main/java/org/fairdatapoint/api/controller/form/FormAutocompleteController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/form/FormAutocompleteController.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.form;
+package org.fairdatateam.fairdatapoint.api.controller.form;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
-import org.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
-import org.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
+import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
+import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
+import org.fairdatateam.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/index/IndexAdminController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexAdminController.java
similarity index 86%
rename from src/main/java/org/fairdatapoint/api/controller/index/IndexAdminController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexAdminController.java
index 2ce62deb..6367f166 100644
--- a/src/main/java/org/fairdatapoint/api/controller/index/IndexAdminController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexAdminController.java
@@ -20,20 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.index;
+package org.fairdatateam.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.service.UtilityService;
-import org.fairdatapoint.service.index.event.EventService;
-import org.fairdatapoint.service.index.harvester.HarvesterService;
-import org.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.service.UtilityService;
+import org.fairdatateam.fairdatapoint.service.index.event.EventService;
+import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/src/main/java/org/fairdatapoint/api/controller/index/IndexEntryController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexEntryController.java
similarity index 86%
rename from src/main/java/org/fairdatapoint/api/controller/index/IndexEntryController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexEntryController.java
index 46e0aea5..b6c6d01d 100644
--- a/src/main/java/org/fairdatapoint/api/controller/index/IndexEntryController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexEntryController.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.index;
+package org.fairdatateam.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/org/fairdatapoint/api/controller/index/IndexPingController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexPingController.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/api/controller/index/IndexPingController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexPingController.java
index a591a3ed..5b79a204 100644
--- a/src/main/java/org/fairdatapoint/api/controller/index/IndexPingController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexPingController.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.index;
+package org.fairdatateam.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -31,13 +31,13 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.service.UtilityService;
-import org.fairdatapoint.service.index.event.EventService;
-import org.fairdatapoint.service.index.harvester.HarvesterService;
-import org.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.service.UtilityService;
+import org.fairdatateam.fairdatapoint.service.index.event.EventService;
+import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/index/IndexSettingsController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexSettingsController.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/api/controller/index/IndexSettingsController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexSettingsController.java
index 250bce48..1117a221 100644
--- a/src/main/java/org/fairdatapoint/api/controller/index/IndexSettingsController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/index/IndexSettingsController.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.index;
+package org.fairdatateam.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import org.fairdatapoint.service.index.settings.IndexSettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
+import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/src/main/java/org/fairdatapoint/api/controller/label/LabelController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/label/LabelController.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/controller/label/LabelController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/label/LabelController.java
index a86fbb1c..90c3a4fc 100644
--- a/src/main/java/org/fairdatapoint/api/controller/label/LabelController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/label/LabelController.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.label;
+package org.fairdatateam.fairdatapoint.api.controller.label;
 
-import org.fairdatapoint.api.dto.label.LabelDTO;
-import org.fairdatapoint.service.label.LabelService;
+import org.fairdatateam.fairdatapoint.api.dto.label.LabelDTO;
+import org.fairdatateam.fairdatapoint.service.label.LabelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/membership/MembershipController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/membership/MembershipController.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/controller/membership/MembershipController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/membership/MembershipController.java
index 036cc100..84b9dfa4 100644
--- a/src/main/java/org/fairdatapoint/api/controller/membership/MembershipController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/membership/MembershipController.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.membership;
+package org.fairdatateam.fairdatapoint.api.controller.membership;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.service.membership.MembershipService;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.service.membership.MembershipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/metadata/GenericController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/controller/metadata/GenericController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java
index 4ff4f459..69ddaf96 100644
--- a/src/main/java/org/fairdatapoint/api/controller/metadata/GenericController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericController.java
@@ -20,28 +20,28 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.metadata;
+package org.fairdatateam.fairdatapoint.api.controller.metadata;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import org.fairdatapoint.entity.exception.ForbiddenException;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.service.metadata.common.MetadataService;
-import org.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
-import org.fairdatapoint.service.metadata.state.MetadataStateService;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
-import org.fairdatapoint.service.schema.MetadataSchemaService;
-import org.fairdatapoint.service.search.SearchFilterCache;
-import org.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
+import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService;
+import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache;
+import org.fairdatateam.fairdatapoint.service.user.CurrentUserService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Value;
@@ -62,11 +62,11 @@
 import java.util.Optional;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.HttpUtil.*;
-import static org.fairdatapoint.util.RdfIOUtil.changeBaseUri;
-import static org.fairdatapoint.util.RdfIOUtil.read;
-import static org.fairdatapoint.util.RdfUtil.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.*;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.changeBaseUri;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.read;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.*;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Metadata")
 @RestController
diff --git a/src/main/java/org/fairdatapoint/api/controller/metadata/GenericMemberController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMemberController.java
similarity index 85%
rename from src/main/java/org/fairdatapoint/api/controller/metadata/GenericMemberController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMemberController.java
index 079230a2..372ebb79 100644
--- a/src/main/java/org/fairdatapoint/api/controller/metadata/GenericMemberController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMemberController.java
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.metadata;
+package org.fairdatateam.fairdatapoint.api.controller.metadata;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.member.MemberCreateDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.service.member.MemberService;
-import org.fairdatapoint.service.metadata.common.MetadataService;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.service.member.MemberService;
+import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +44,8 @@
 
 import java.util.List;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier;
-import static org.fairdatapoint.util.HttpUtil.getMetadataIRI;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI;
 
 @Tag(name = "Authentication and Authorization")
 @RestController
diff --git a/src/main/java/org/fairdatapoint/api/controller/metadata/GenericMetaController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java
similarity index 80%
rename from src/main/java/org/fairdatapoint/api/controller/metadata/GenericMetaController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java
index b2d69462..c7b9eac0 100644
--- a/src/main/java/org/fairdatapoint/api/controller/metadata/GenericMetaController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/metadata/GenericMetaController.java
@@ -20,24 +20,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.metadata;
+package org.fairdatateam.fairdatapoint.api.controller.metadata;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.api.dto.metadata.MetaDTO;
-import org.fairdatapoint.api.dto.metadata.MetaPathDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.member.MemberService;
-import org.fairdatapoint.service.metadata.common.MetadataService;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
-import org.fairdatapoint.service.metadata.state.MetadataStateService;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaPathDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.member.MemberService;
+import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
+import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
@@ -49,11 +49,11 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getTitle;
-import static org.fairdatapoint.util.HttpUtil.getMetadataIRI;
-import static org.fairdatapoint.util.RdfUtil.getStringObjectBy;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getTitle;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.getMetadataIRI;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.getStringObjectBy;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Metadata")
 @RestController
diff --git a/src/main/java/org/fairdatapoint/api/controller/profile/ProfileController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/profile/ProfileController.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/api/controller/profile/ProfileController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/profile/ProfileController.java
index edea5cd0..b65eaafc 100644
--- a/src/main/java/org/fairdatapoint/api/controller/profile/ProfileController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/profile/ProfileController.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.profile;
+package org.fairdatateam.fairdatapoint.api.controller.profile;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.service.profile.ProfileService;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.service.profile.ProfileService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +37,8 @@
 import java.util.Optional;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.HttpUtil.getRequestURL;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRequestURL;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Client")
 @RestController
diff --git a/src/main/java/org/fairdatapoint/api/controller/reset/ResetController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/reset/ResetController.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/api/controller/reset/ResetController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/reset/ResetController.java
index 47134554..a282e474 100644
--- a/src/main/java/org/fairdatapoint/api/controller/reset/ResetController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/reset/ResetController.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.reset;
+package org.fairdatateam.fairdatapoint.api.controller.reset;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.reset.ResetDTO;
-import org.fairdatapoint.service.reset.ResetService;
+import org.fairdatateam.fairdatapoint.api.dto.reset.ResetDTO;
+import org.fairdatateam.fairdatapoint.service.reset.ResetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/org/fairdatapoint/api/controller/resource/ResourceDefinitionController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
index a5610db0..7ac85ba1 100644
--- a/src/main/java/org/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.resource;
+package org.fairdatateam.fairdatapoint.api.controller.resource;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/schema/MetadataSchemaController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/schema/MetadataSchemaController.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/controller/schema/MetadataSchemaController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/schema/MetadataSchemaController.java
index 8fe98339..10a07ab6 100644
--- a/src/main/java/org/fairdatapoint/api/controller/schema/MetadataSchemaController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/schema/MetadataSchemaController.java
@@ -20,15 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.schema;
+package org.fairdatateam.fairdatapoint.api.controller.schema;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.schema.*;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.exception.UnauthorizedException;
-import org.fairdatapoint.service.schema.MetadataSchemaService;
-import org.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatateam.fairdatapoint.api.dto.schema.*;
+import org.fairdatateam.fairdatapoint.api.dto.schema.*;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException;
+import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService;
+import org.fairdatateam.fairdatapoint.service.user.CurrentUserService;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/org/fairdatapoint/api/controller/search/SearchController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchController.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/controller/search/SearchController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchController.java
index a2e1d5bb..e5968933 100644
--- a/src/main/java/org/fairdatapoint/api/controller/search/SearchController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchController.java
@@ -20,13 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.search;
+package org.fairdatateam.fairdatapoint.api.controller.search;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.search.*;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.service.search.SearchService;
+import org.fairdatateam.fairdatapoint.api.dto.search.*;
+import org.fairdatateam.fairdatapoint.api.dto.search.*;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.service.search.SearchService;
 import org.eclipse.rdf4j.query.MalformedQueryException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/search/SearchSavedQueryController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchSavedQueryController.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/api/controller/search/SearchSavedQueryController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchSavedQueryController.java
index cc37ce50..145d7f5e 100644
--- a/src/main/java/org/fairdatapoint/api/controller/search/SearchSavedQueryController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/search/SearchSavedQueryController.java
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.search;
+package org.fairdatateam.fairdatapoint.api.controller.search;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.search.SearchResultDTO;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.service.search.SearchService;
-import org.fairdatapoint.service.search.query.SearchSavedQueryService;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchResultDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.service.search.SearchService;
+import org.fairdatateam.fairdatapoint.service.search.query.SearchSavedQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/settings/SettingsController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/settings/SettingsController.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/api/controller/settings/SettingsController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/settings/SettingsController.java
index 60a18d2d..4e816ccc 100644
--- a/src/main/java/org/fairdatapoint/api/controller/settings/SettingsController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/settings/SettingsController.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.settings;
+package org.fairdatateam.fairdatapoint.api.controller.settings;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.settings.SettingsDTO;
-import org.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
-import org.fairdatapoint.service.settings.SettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsDTO;
+import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/src/main/java/org/fairdatapoint/api/controller/token/TokenController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/token/TokenController.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/controller/token/TokenController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/token/TokenController.java
index 45f103c6..12b6498f 100644
--- a/src/main/java/org/fairdatapoint/api/controller/token/TokenController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/token/TokenController.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.token;
+package org.fairdatateam.fairdatapoint.api.controller.token;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.auth.AuthDTO;
-import org.fairdatapoint.api.dto.auth.TokenDTO;
-import org.fairdatapoint.service.jwt.JwtService;
+import org.fairdatateam.fairdatapoint.api.dto.auth.AuthDTO;
+import org.fairdatateam.fairdatapoint.api.dto.auth.TokenDTO;
+import org.fairdatateam.fairdatapoint.service.jwt.JwtService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/controller/user/UserController.java b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/user/UserController.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/api/controller/user/UserController.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/controller/user/UserController.java
index 66d72ec0..bbfb922c 100644
--- a/src/main/java/org/fairdatapoint/api/controller/user/UserController.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/controller/user/UserController.java
@@ -20,14 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.user;
+package org.fairdatateam.fairdatapoint.api.controller.user;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.user.*;
-import org.fairdatapoint.entity.exception.ForbiddenException;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.service.user.UserService;
+import org.fairdatateam.fairdatapoint.api.dto.user.*;
+import org.fairdatateam.fairdatapoint.api.dto.user.*;
+import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.service.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/org/fairdatapoint/api/converter/ErrorConverter.java b/src/main/java/org/fairdatateam/fairdatapoint/api/converter/ErrorConverter.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/converter/ErrorConverter.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/converter/ErrorConverter.java
index 571c19ae..66ccba1e 100644
--- a/src/main/java/org/fairdatapoint/api/converter/ErrorConverter.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/converter/ErrorConverter.java
@@ -25,9 +25,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.api.converter;
+package org.fairdatateam.fairdatapoint.api.converter;
 
-import org.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
diff --git a/src/main/java/org/fairdatapoint/api/converter/RdfConverter.java b/src/main/java/org/fairdatateam/fairdatapoint/api/converter/RdfConverter.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/converter/RdfConverter.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/converter/RdfConverter.java
index a2f05f03..79aafcd8 100644
--- a/src/main/java/org/fairdatapoint/api/converter/RdfConverter.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/converter/RdfConverter.java
@@ -25,9 +25,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.api.converter;
+package org.fairdatateam.fairdatapoint.api.converter;
 
-import org.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 import org.eclipse.rdf4j.rio.RDFFormat;
diff --git a/src/main/java/org/fairdatapoint/api/dto/apikey/ApiKeyDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
index 1a167ede..93a88d8a 100644
--- a/src/main/java/org/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.apikey;
+package org.fairdatateam.fairdatapoint.api.dto.apikey;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/auth/AuthDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/AuthDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/auth/AuthDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/AuthDTO.java
index 72b24a0d..4063430f 100644
--- a/src/main/java/org/fairdatapoint/api/dto/auth/AuthDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/AuthDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.auth;
+package org.fairdatateam.fairdatapoint.api.dto.auth;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/org/fairdatapoint/api/dto/auth/TokenDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/TokenDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/auth/TokenDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/TokenDTO.java
index 99dd199b..4a772e28 100644
--- a/src/main/java/org/fairdatapoint/api/dto/auth/TokenDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/auth/TokenDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.auth;
+package org.fairdatateam.fairdatapoint.api.dto.auth;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/api/dto/common/BreadcrumbDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/common/BreadcrumbDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/common/BreadcrumbDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/common/BreadcrumbDTO.java
index ab84327d..55db5ed9 100644
--- a/src/main/java/org/fairdatapoint/api/dto/common/BreadcrumbDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/common/BreadcrumbDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.common;
+package org.fairdatateam.fairdatapoint.api.dto.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/api/dto/config/BootstrapConfigDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
index c359a881..0f4b68ae 100644
--- a/src/main/java/org/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.config;
+package org.fairdatateam.fairdatapoint.api.dto.config;
 
 import lombok.*;
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
index 6c31d22c..f14844e7 100644
--- a/src/main/java/org/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.dashboard;
+package org.fairdatateam.fairdatapoint.api.dto.dashboard;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/org/fairdatapoint/api/dto/error/ErrorDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/error/ErrorDTO.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/api/dto/error/ErrorDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/error/ErrorDTO.java
index 8400bb0a..351f0813 100644
--- a/src/main/java/org/fairdatapoint/api/dto/error/ErrorDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/error/ErrorDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.error;
+package org.fairdatateam.fairdatapoint.api.dto.error;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
index fc385200..4b3adf6d 100644
--- a/src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.form;
+package org.fairdatateam.fairdatapoint.api.dto.form;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
index 1ac26455..4acaeeff 100644
--- a/src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.form;
+package org.fairdatateam.fairdatapoint.api.dto.form;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatateam.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
index 89635ec2..d5011bed 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.entry;
+package org.fairdatateam.fairdatapoint.api.dto.index.entry;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
index 64112f19..c44f0dfc 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.entry;
+package org.fairdatateam.fairdatapoint.api.dto.index.entry;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.api.dto.index.event.EventDTO;
-import org.fairdatapoint.entity.index.entry.RepositoryMetadata;
+import org.fairdatateam.fairdatapoint.api.dto.index.event.EventDTO;
+import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata;
 import org.hibernate.validator.constraints.URL;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
index b43350e9..c677ea08 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.entry;
+package org.fairdatateam.fairdatapoint.api.dto.index.entry;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
index 7ad3abbc..d2e5580b 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.entry;
+package org.fairdatateam.fairdatapoint.api.dto.index.entry;
 
 public enum IndexEntryStateDTO {
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/event/EventDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/event/EventDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/index/event/EventDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/event/EventDTO.java
index b5ce07ac..356fbd47 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/event/EventDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/event/EventDTO.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.event;
+package org.fairdatateam.fairdatapoint.api.dto.index.event;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.entity.index.event.EventType;
+import org.fairdatateam.fairdatapoint.entity.index.event.EventType;
 
 import java.util.UUID;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/ping/PingDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/ping/PingDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/index/ping/PingDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/ping/PingDTO.java
index 98fcdce4..a828cd1e 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/ping/PingDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/ping/PingDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.ping;
+package org.fairdatateam.fairdatapoint.api.dto.index.ping;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
index ee2d3dc2..645a4fc2 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.settings;
+package org.fairdatateam.fairdatapoint.api.dto.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
index 06394cf2..de9b3830 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.settings;
+package org.fairdatateam.fairdatapoint.api.dto.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.api.validator.ValidDuration;
+import org.fairdatateam.fairdatapoint.api.validator.ValidDuration;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
index 4a5ba87c..79a9b7f4 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.settings;
+package org.fairdatateam.fairdatapoint.api.dto.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.api.validator.ValidDuration;
+import org.fairdatateam.fairdatapoint.api.validator.ValidDuration;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
index fb58e549..ae643b32 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.settings;
+package org.fairdatateam.fairdatapoint.api.dto.index.settings;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/org/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
index 3699ece2..7917b9f5 100644
--- a/src/main/java/org/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.index.webhook;
+package org.fairdatateam.fairdatapoint.api.dto.index.webhook;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.fairdatapoint.entity.index.webhook.WebhookEvent;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/label/LabelDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/label/LabelDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/label/LabelDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/label/LabelDTO.java
index 6d9099cf..2b363efb 100644
--- a/src/main/java/org/fairdatapoint/api/dto/label/LabelDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/label/LabelDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.label;
+package org.fairdatateam.fairdatapoint.api.dto.label;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/member/MemberCreateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberCreateDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/member/MemberCreateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberCreateDTO.java
index 6ea0d7f4..b22f7663 100644
--- a/src/main/java/org/fairdatapoint/api/dto/member/MemberCreateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberCreateDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.member;
+package org.fairdatateam.fairdatapoint.api.dto.member;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/api/dto/member/MemberDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/api/dto/member/MemberDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java
index b21c4a10..6f7839ee 100644
--- a/src/main/java/org/fairdatapoint/api/dto/member/MemberDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/member/MemberDTO.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.member;
+package org.fairdatateam.fairdatapoint.api.dto.member;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.api.dto.user.UserSimpleDTO;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserSimpleDTO;
 
 @Data
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/membership/MembershipDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/membership/MembershipDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipDTO.java
index 64cf9a85..6137c9c4 100644
--- a/src/main/java/org/fairdatapoint/api/dto/membership/MembershipDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.membership;
+package org.fairdatateam.fairdatapoint.api.dto.membership;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/org/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
index 96975920..14d41a31 100644
--- a/src/main/java/org/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.membership;
+package org.fairdatateam.fairdatapoint.api.dto.membership;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/org/fairdatapoint/api/dto/metadata/MetaDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaDTO.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/api/dto/metadata/MetaDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaDTO.java
index 3def572c..5e656e44 100644
--- a/src/main/java/org/fairdatapoint/api/dto/metadata/MetaDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.metadata;
+package org.fairdatateam.fairdatapoint.api.dto.metadata;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -29,7 +29,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/metadata/MetaPathDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaPathDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/metadata/MetaPathDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaPathDTO.java
index e807bc18..34e524ed 100644
--- a/src/main/java/org/fairdatapoint/api/dto/metadata/MetaPathDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaPathDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.metadata;
+package org.fairdatateam.fairdatapoint.api.dto.metadata;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
index ccb348aa..eaea5fc8 100644
--- a/src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.metadata;
+package org.fairdatateam.fairdatapoint.api.dto.metadata;
 
 import lombok.*;
-import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateDTO.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateDTO.java
index 26b83c3f..ad7ad4e2 100644
--- a/src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/metadata/MetaStateDTO.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.metadata;
+package org.fairdatateam.fairdatapoint.api.dto.metadata;
 
 import lombok.*;
-import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/reset/ResetDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/reset/ResetDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/reset/ResetDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/reset/ResetDTO.java
index 24963f36..75821c64 100644
--- a/src/main/java/org/fairdatapoint/api/dto/reset/ResetDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/reset/ResetDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.reset;
+package org.fairdatateam.fairdatapoint.api.dto.reset;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
index 02ed1f12..cef5e986 100644
--- a/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.resource;
+package org.fairdatateam.fairdatapoint.api.dto.resource;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -29,8 +29,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import org.fairdatapoint.entity.resource.ResourceDefinitionLink;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionLink;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
index be792765..7abc4552 100644
--- a/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.resource;
+package org.fairdatateam.fairdatapoint.api.dto.resource;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -29,8 +29,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import org.fairdatapoint.entity.resource.ResourceDefinitionLink;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionLink;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
index b96b4252..e1f1bfa2 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
index 63da7000..fcb9c227 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
index ea438a11..d4a42570 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
index 0cb97e62..9012310a 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
index 16fe5e93..89138b35 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.api.validator.ValidSemVer;
+import org.fairdatateam.fairdatapoint.api.validator.ValidSemVer;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
index d7f40d5a..44617229 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
index 4943056c..d8097391 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 public enum MetadataSchemaRemoteState {
     DIRTY, CONFLICT, ALREADY_IMPORTED, NOT_IMPORTED
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
index 537fd31d..3ad25e46 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
index 20256e1c..cd7a07ec 100644
--- a/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.schema;
+package org.fairdatateam.fairdatapoint.api.dto.schema;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.fairdatapoint.entity.schema.MetadataSchemaType;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/org/fairdatapoint/api/dto/search/SearchFilterDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterDTO.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/api/dto/search/SearchFilterDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterDTO.java
index d0ef1311..eb824dd5 100644
--- a/src/main/java/org/fairdatapoint/api/dto/search/SearchFilterDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterDTO.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.search;
+package org.fairdatateam.fairdatapoint.api.dto.search;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.fairdatapoint.api.validator.ValidIri;
-import org.fairdatapoint.entity.search.SearchFilterType;
+import org.fairdatateam.fairdatapoint.api.validator.ValidIri;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterType;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/search/SearchFilterItemDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
index 1f6c341d..88f0bf6c 100644
--- a/src/main/java/org/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.search;
+package org.fairdatateam.fairdatapoint.api.dto.search;
 
 import lombok.*;
-import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatateam.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/search/SearchQueryDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryDTO.java
index b2d4155c..a5b73178 100644
--- a/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.search;
+package org.fairdatateam.fairdatapoint.api.dto.search;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
index 30f9bbeb..274d234f 100644
--- a/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.search;
+package org.fairdatateam.fairdatapoint.api.dto.search;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
index 6a8c60ac..06c229c7 100644
--- a/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.search;
+package org.fairdatateam.fairdatapoint.api.dto.search;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/api/dto/search/SearchResultDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchResultDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/search/SearchResultDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchResultDTO.java
index c3f7cde4..d7b91644 100644
--- a/src/main/java/org/fairdatapoint/api/dto/search/SearchResultDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchResultDTO.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.search;
+package org.fairdatateam.fairdatapoint.api.dto.search;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.entity.search.SearchResultRelation;
+import org.fairdatateam.fairdatapoint.entity.search.SearchResultRelation;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
index e316a4b7..d736571b 100644
--- a/src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.search;
+package org.fairdatateam.fairdatapoint.api.dto.search;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
index 14b1fae1..4c22f9c0 100644
--- a/src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.search;
+package org.fairdatateam.fairdatapoint.api.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType;
 
 import java.time.Instant;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
index 2b53a8fe..5a70e910 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatateam.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsDTO.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsDTO.java
index 9eb00ed1..18db5cb2 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsDTO.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.*;
-import org.fairdatapoint.entity.settings.SettingsMetricsEntry;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsMetricsEntry;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
index e0230f79..d73a3b6f 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
index 5a3a7ca3..19fa6122 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingDTO.java
index 85b5ba78..d80d26dc 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
index 82fc1901..9e749c1c 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
index d8073768..65bc4246 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsSearchDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
index 72c1caf2..6806118b 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.fairdatapoint.api.dto.search.SearchFilterDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterDTO;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
index 85956108..23fe9010 100644
--- a/src/main/java/org/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.settings;
+package org.fairdatateam.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import org.fairdatapoint.entity.settings.SettingsMetricsEntry;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsMetricsEntry;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/api/dto/user/UserChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserChangeDTO.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/api/dto/user/UserChangeDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserChangeDTO.java
index 1506a584..20a6a538 100644
--- a/src/main/java/org/fairdatapoint/api/dto/user/UserChangeDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserChangeDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.user;
+package org.fairdatateam.fairdatapoint.api.dto.user;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -28,7 +28,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/user/UserCreateDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserCreateDTO.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/api/dto/user/UserCreateDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserCreateDTO.java
index 2b5410a8..7bd62093 100644
--- a/src/main/java/org/fairdatapoint/api/dto/user/UserCreateDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserCreateDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.user;
+package org.fairdatateam.fairdatapoint.api.dto.user;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -28,7 +28,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/user/UserDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserDTO.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/dto/user/UserDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserDTO.java
index f8179f2b..0ffa3fbf 100644
--- a/src/main/java/org/fairdatapoint/api/dto/user/UserDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserDTO.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.user;
+package org.fairdatateam.fairdatapoint.api.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/api/dto/user/UserPasswordDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserPasswordDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/user/UserPasswordDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserPasswordDTO.java
index 6bd4ed8f..c0982a80 100644
--- a/src/main/java/org/fairdatapoint/api/dto/user/UserPasswordDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserPasswordDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.user;
+package org.fairdatateam.fairdatapoint.api.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/api/dto/user/UserProfileChangeDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
index 6e84914b..ccf81865 100644
--- a/src/main/java/org/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.user;
+package org.fairdatateam.fairdatapoint.api.dto.user;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/api/dto/user/UserSimpleDTO.java b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserSimpleDTO.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/dto/user/UserSimpleDTO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserSimpleDTO.java
index b928f9b8..1f236b1f 100644
--- a/src/main/java/org/fairdatapoint/api/dto/user/UserSimpleDTO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/dto/user/UserSimpleDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.dto.user;
+package org.fairdatateam.fairdatapoint.api.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/org/fairdatapoint/api/filter/CORSFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/api/filter/CORSFilter.java
similarity index 98%
rename from src/main/java/org/fairdatapoint/api/filter/CORSFilter.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/filter/CORSFilter.java
index 86e161a0..5dd7342d 100644
--- a/src/main/java/org/fairdatapoint/api/filter/CORSFilter.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/filter/CORSFilter.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.api.filter;
+package org.fairdatateam.fairdatapoint.api.filter;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
diff --git a/src/main/java/org/fairdatapoint/api/filter/FilterConfigurer.java b/src/main/java/org/fairdatateam/fairdatapoint/api/filter/FilterConfigurer.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/api/filter/FilterConfigurer.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/filter/FilterConfigurer.java
index 22a15992..1942cb2a 100644
--- a/src/main/java/org/fairdatapoint/api/filter/FilterConfigurer.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/filter/FilterConfigurer.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.filter;
+package org.fairdatateam.fairdatapoint.api.filter;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
diff --git a/src/main/java/org/fairdatapoint/api/filter/JwtTokenFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/api/filter/JwtTokenFilter.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/api/filter/JwtTokenFilter.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/filter/JwtTokenFilter.java
index 9f3d9ba5..21d56d49 100644
--- a/src/main/java/org/fairdatapoint/api/filter/JwtTokenFilter.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/filter/JwtTokenFilter.java
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.filter;
+package org.fairdatateam.fairdatapoint.api.filter;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.entity.exception.UnauthorizedException;
-import org.fairdatapoint.service.apikey.ApiKeyService;
-import org.fairdatapoint.service.jwt.JwtService;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException;
+import org.fairdatateam.fairdatapoint.service.apikey.ApiKeyService;
+import org.fairdatateam.fairdatapoint.service.jwt.JwtService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -41,7 +41,7 @@
 
 import java.io.IOException;
 
-import static org.fairdatapoint.util.HttpUtil.getToken;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.getToken;
 
 @Component
 public class JwtTokenFilter extends OncePerRequestFilter {
diff --git a/src/main/java/org/fairdatapoint/api/filter/LoggingFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/api/filter/LoggingFilter.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/filter/LoggingFilter.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/filter/LoggingFilter.java
index 67da138c..acb86831 100644
--- a/src/main/java/org/fairdatapoint/api/filter/LoggingFilter.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/filter/LoggingFilter.java
@@ -25,13 +25,13 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.api.filter;
+package org.fairdatateam.fairdatapoint.api.filter;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.fairdatapoint.service.UtilityService;
+import org.fairdatateam.fairdatapoint.service.UtilityService;
 import org.apache.logging.log4j.ThreadContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
diff --git a/src/main/java/org/fairdatapoint/api/validator/DurationValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/DurationValidator.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/validator/DurationValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/validator/DurationValidator.java
index 67807726..bfab2e9c 100644
--- a/src/main/java/org/fairdatapoint/api/validator/DurationValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/DurationValidator.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.validator;
+package org.fairdatateam.fairdatapoint.api.validator;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
diff --git a/src/main/java/org/fairdatapoint/api/validator/IriValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/IriValidator.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/api/validator/IriValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/validator/IriValidator.java
index 7848440c..2fda2e54 100644
--- a/src/main/java/org/fairdatapoint/api/validator/IriValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/IriValidator.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.validator;
+package org.fairdatateam.fairdatapoint.api.validator;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 public class IriValidator implements ConstraintValidator<ValidIri, String> {
 
diff --git a/src/main/java/org/fairdatapoint/api/validator/SemVerValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/api/validator/SemVerValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java
index 702e71a1..824fe02b 100644
--- a/src/main/java/org/fairdatapoint/api/validator/SemVerValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/SemVerValidator.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.validator;
+package org.fairdatateam.fairdatapoint.api.validator;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
-import org.fairdatapoint.entity.schema.SemVer;
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
 
 public class SemVerValidator implements ConstraintValidator<ValidSemVer, String> {
 
diff --git a/src/main/java/org/fairdatapoint/api/validator/ValidDuration.java b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidDuration.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/validator/ValidDuration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidDuration.java
index aaf0f051..ae310921 100644
--- a/src/main/java/org/fairdatapoint/api/validator/ValidDuration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidDuration.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.validator;
+package org.fairdatateam.fairdatapoint.api.validator;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
diff --git a/src/main/java/org/fairdatapoint/api/validator/ValidIri.java b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidIri.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/validator/ValidIri.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidIri.java
index aa5b75c1..3f4fd467 100644
--- a/src/main/java/org/fairdatapoint/api/validator/ValidIri.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidIri.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.validator;
+package org.fairdatateam.fairdatapoint.api.validator;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
diff --git a/src/main/java/org/fairdatapoint/api/validator/ValidSemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidSemVer.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/api/validator/ValidSemVer.java
rename to src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidSemVer.java
index baab1b4e..3b073ebe 100644
--- a/src/main/java/org/fairdatapoint/api/validator/ValidSemVer.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/api/validator/ValidSemVer.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.validator;
+package org.fairdatateam.fairdatapoint.api.validator;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
diff --git a/src/main/java/org/fairdatapoint/config/AclConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/config/AclConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java
index 475b65f4..1a7bdab5 100644
--- a/src/main/java/org/fairdatapoint/config/AclConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/AclConfig.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
-import org.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
diff --git a/src/main/java/org/fairdatapoint/config/AclMethodSecurityConfiguration.java b/src/main/java/org/fairdatateam/fairdatapoint/config/AclMethodSecurityConfiguration.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/config/AclMethodSecurityConfiguration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/AclMethodSecurityConfiguration.java
index ea526475..9ab9eb62 100644
--- a/src/main/java/org/fairdatapoint/config/AclMethodSecurityConfiguration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/AclMethodSecurityConfiguration.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/fairdatapoint/config/AsyncConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/AsyncConfig.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/config/AsyncConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/AsyncConfig.java
index d4d4af38..84a59477 100644
--- a/src/main/java/org/fairdatapoint/config/AsyncConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/AsyncConfig.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
-import org.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.Profiles;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.EnableAsync;
diff --git a/src/main/java/org/fairdatapoint/config/CacheConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/config/CacheConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java
index ff9bf424..4c17c5a1 100644
--- a/src/main/java/org/fairdatapoint/config/CacheConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/CacheConfig.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
@@ -29,7 +29,7 @@
 
 import java.util.List;
 
-import static org.fairdatapoint.config.AclConfig.ACL_CACHE;
+import static org.fairdatateam.fairdatapoint.config.AclConfig.ACL_CACHE;
 
 @Configuration
 @EnableCaching
diff --git a/src/main/java/org/fairdatapoint/config/ConverterConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/config/ConverterConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java
index 8f437f79..5a1c00fc 100644
--- a/src/main/java/org/fairdatapoint/config/ConverterConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/ConverterConfig.java
@@ -25,10 +25,10 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
-import org.fairdatapoint.api.converter.ErrorConverter;
-import org.fairdatapoint.api.converter.RdfConverter;
+import org.fairdatateam.fairdatapoint.api.converter.ErrorConverter;
+import org.fairdatateam.fairdatapoint.api.converter.RdfConverter;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/fairdatapoint/config/HttpClientConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/HttpClientConfig.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/config/HttpClientConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/HttpClientConfig.java
index 6da7fa49..222bf96a 100644
--- a/src/main/java/org/fairdatapoint/config/HttpClientConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/HttpClientConfig.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/org/fairdatapoint/config/MetadataConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/MetadataConfig.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/config/MetadataConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/MetadataConfig.java
index 569a82f3..a850bea6 100644
--- a/src/main/java/org/fairdatapoint/config/MetadataConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/MetadataConfig.java
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
-import org.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties;
 import org.eclipse.rdf4j.model.IRI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import static org.fairdatapoint.util.HttpUtil.removeLastSlash;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.removeLastSlash;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Configuration
 public class MetadataConfig {
diff --git a/src/main/java/org/fairdatapoint/config/MongoConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/config/MongoConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java
index 0283f7b0..5ca29ac8 100644
--- a/src/main/java/org/fairdatapoint/config/MongoConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/MongoConfig.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import io.mongock.api.config.LegacyMigration;
 import io.mongock.driver.mongodb.springdata.v4.SpringDataMongoV4Driver;
 import io.mongock.runner.springboot.MongockSpringboot;
 import io.mongock.runner.springboot.base.MongockInitializingBeanRunner;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -41,7 +41,7 @@
 @EnableMongoAuditing
 @EnableMongoRepositories(
         basePackages = {
-            "org.fairdatapoint",
+            "org.fairdatateam.fairdatapoint",
             "org.fairdatateam.rdf.migration",
             "org.fairdatateam.security.acls"
         }
@@ -65,7 +65,7 @@ public MongockInitializingBeanRunner mongockApplicationRunner(
         return MongockSpringboot.builder()
                 .setDriver(SpringDataMongoV4Driver.withDefaultLock(mongoTemplate))
                 .addMigrationScanPackage(
-                        "org.fairdatapoint.database.mongo.migration.production"
+                        "org.fairdatateam.fairdatapoint.database.mongo.migration.production"
                 )
                 .setSpringContext(springContext)
                 .setLegacyMigration(new LegacyMigration("dbchangelog"))
diff --git a/src/main/java/org/fairdatapoint/config/OpenApiConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/OpenApiConfig.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/config/OpenApiConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/OpenApiConfig.java
index 05f9b6e2..f3245883 100644
--- a/src/main/java/org/fairdatapoint/config/OpenApiConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/OpenApiConfig.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -31,9 +31,9 @@
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
-import org.fairdatapoint.config.properties.InstanceProperties;
-import org.fairdatapoint.config.properties.OpenApiProperties;
-import org.fairdatapoint.service.openapi.OpenApiTagsUtils;
+import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatateam.fairdatapoint.config.properties.OpenApiProperties;
+import org.fairdatateam.fairdatapoint.service.openapi.OpenApiTagsUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/src/main/java/org/fairdatapoint/config/PasswordConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/PasswordConfig.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/config/PasswordConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/PasswordConfig.java
index 2dbf2f05..61322160 100644
--- a/src/main/java/org/fairdatapoint/config/PasswordConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/PasswordConfig.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/fairdatapoint/config/PropertyConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/PropertyConfig.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/config/PropertyConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/PropertyConfig.java
index 19ea844b..878f2bf0 100644
--- a/src/main/java/org/fairdatapoint/config/PropertyConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/PropertyConfig.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/fairdatapoint/config/RepositoryConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryConfig.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/config/RepositoryConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryConfig.java
index 7f35f61f..17771e1b 100644
--- a/src/main/java/org/fairdatapoint/config/RepositoryConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryConfig.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.config.properties.RepositoryProperties;
+import org.fairdatateam.fairdatapoint.config.properties.RepositoryProperties;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.repository.config.RepositoryConfigException;
@@ -42,7 +42,7 @@
 
 import java.io.File;
 
-import static org.fairdatapoint.util.HttpUtil.removeLastSlash;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.removeLastSlash;
 
 @Slf4j
 @Configuration
diff --git a/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryMigrationConfig.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryMigrationConfig.java
index 1d619bac..cc585588 100644
--- a/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/RepositoryMigrationConfig.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
-import org.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.Profiles;
 import org.fairdatateam.rdf.migration.database.RdfMigrationRepository;
 import org.fairdatateam.rdf.migration.runner.RdfProductionMigrationRunner;
 import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/fairdatapoint/config/SecurityConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/SecurityConfig.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/config/SecurityConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/SecurityConfig.java
index 1b454582..b425b731 100644
--- a/src/main/java/org/fairdatapoint/config/SecurityConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/SecurityConfig.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
-import org.fairdatapoint.api.filter.FilterConfigurer;
+import org.fairdatateam.fairdatapoint.api.filter.FilterConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
diff --git a/src/main/java/org/fairdatapoint/config/WebConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/WebConfig.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/config/WebConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/WebConfig.java
index ec7cf7d9..3a341e6b 100644
--- a/src/main/java/org/fairdatapoint/config/WebConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/WebConfig.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.fairdatapoint.api.converter.ErrorConverter;
-import org.fairdatapoint.api.converter.RdfConverter;
+import org.fairdatateam.fairdatapoint.api.converter.ErrorConverter;
+import org.fairdatateam.fairdatapoint.api.converter.RdfConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/fairdatapoint/config/WorkerConfig.java b/src/main/java/org/fairdatateam/fairdatapoint/config/WorkerConfig.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/config/WorkerConfig.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/WorkerConfig.java
index db9229cd..7a3a8018 100644
--- a/src/main/java/org/fairdatapoint/config/WorkerConfig.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/WorkerConfig.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/src/main/java/org/fairdatapoint/config/properties/InstanceProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/InstanceProperties.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/config/properties/InstanceProperties.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/properties/InstanceProperties.java
index 93664bb1..6fadfb4c 100644
--- a/src/main/java/org/fairdatapoint/config/properties/InstanceProperties.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/InstanceProperties.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config.properties;
+package org.fairdatateam.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/config/properties/OpenApiContactProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiContactProperties.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/config/properties/OpenApiContactProperties.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiContactProperties.java
index 00fa4815..f4bf1bda 100644
--- a/src/main/java/org/fairdatapoint/config/properties/OpenApiContactProperties.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiContactProperties.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config.properties;
+package org.fairdatateam.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/config/properties/OpenApiProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiProperties.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/config/properties/OpenApiProperties.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiProperties.java
index a5c34210..0a783ca9 100644
--- a/src/main/java/org/fairdatapoint/config/properties/OpenApiProperties.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/OpenApiProperties.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config.properties;
+package org.fairdatateam.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/config/properties/PingProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/PingProperties.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/config/properties/PingProperties.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/properties/PingProperties.java
index eaf20854..71e59e32 100644
--- a/src/main/java/org/fairdatapoint/config/properties/PingProperties.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/PingProperties.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config.properties;
+package org.fairdatateam.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/config/properties/RepositoryBasicProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryBasicProperties.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/config/properties/RepositoryBasicProperties.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryBasicProperties.java
index e1600ba3..c8ef2802 100644
--- a/src/main/java/org/fairdatapoint/config/properties/RepositoryBasicProperties.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryBasicProperties.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config.properties;
+package org.fairdatateam.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/config/properties/RepositoryNativeProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryNativeProperties.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/config/properties/RepositoryNativeProperties.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryNativeProperties.java
index 92d10a67..908662b3 100644
--- a/src/main/java/org/fairdatapoint/config/properties/RepositoryNativeProperties.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryNativeProperties.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config.properties;
+package org.fairdatateam.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/config/properties/RepositoryProperties.java b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryProperties.java
similarity index 98%
rename from src/main/java/org/fairdatapoint/config/properties/RepositoryProperties.java
rename to src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryProperties.java
index efaa449f..4a1d04d6 100644
--- a/src/main/java/org/fairdatapoint/config/properties/RepositoryProperties.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/config/properties/RepositoryProperties.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config.properties;
+package org.fairdatateam.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/database/common/migration/Migration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/common/migration/Migration.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/database/common/migration/Migration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/common/migration/Migration.java
index 07254fee..b06904b3 100644
--- a/src/main/java/org/fairdatapoint/database/common/migration/Migration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/common/migration/Migration.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.common.migration;
+package org.fairdatateam.fairdatapoint.database.common.migration;
 
 public interface Migration {
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/MigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java
similarity index 67%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/MigrationRunner.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java
index d34c5e90..927e9311 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/MigrationRunner.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/MigrationRunner.java
@@ -20,24 +20,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development;
 
 import jakarta.annotation.PostConstruct;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.database.mongo.migration.development.acl.AclMigration;
-import org.fairdatapoint.database.mongo.migration.development.apikey.ApiKeyMigration;
-import org.fairdatapoint.database.mongo.migration.development.index.entry.IndexEntryMigration;
-import org.fairdatapoint.database.mongo.migration.development.index.event.EventMigration;
-import org.fairdatapoint.database.mongo.migration.development.membership.MembershipMigration;
-import org.fairdatapoint.database.mongo.migration.development.metadata.MetadataMigration;
-import org.fairdatapoint.database.mongo.migration.development.resource.ResourceDefinitionMigration;
-import org.fairdatapoint.database.mongo.migration.development.schema.MetadataSchemaMigration;
-import org.fairdatapoint.database.mongo.migration.development.settings.SettingsMigration;
-import org.fairdatapoint.database.mongo.migration.development.user.UserMigration;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import org.fairdatapoint.service.search.SearchFilterCache;
-import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.acl.AclMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.ApiKeyMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry.IndexEntryMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.event.EventMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.MembershipMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.MetadataMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.ResourceDefinitionMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.MetadataSchemaMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.SettingsMigration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.UserMigration;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
+import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java
index 4a5204b3..b40684e4 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.acl;
-
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.service.member.MemberService;
-import org.fairdatapoint.service.security.MongoAuthenticationService;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.acl;
+
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.service.member.MemberService;
+import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.fairdatateam.security.acls.dao.AclRepository;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java
similarity index 82%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java
index 3cf8881d..6fe1a08c 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/ApiKeyMigration.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.apikey;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey;
 
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures;
-import org.fairdatapoint.database.mongo.repository.ApiKeyRepository;
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ApiKeyRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java
index 96ed3224..f7e9e8fa 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/apikey/data/ApiKeyFixtures.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.apikey.data;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data;
 
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java
similarity index 84%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java
index 2e4f5e42..29f2b005 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/IndexEntryMigration.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.index.entry;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry;
 
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.migration.development.index.entry.data.IndexEntryFixtures;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry.data.IndexEntryFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java
index aaca0338..bd4f3df0 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/entry/data/IndexEntryFixtures.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.index.entry.data;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.entry.data;
 
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.entity.index.entry.RepositoryMetadata;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
 import java.util.HashMap;
 
-import static org.fairdatapoint.entity.index.entry.IndexEntryState.*;
+import static org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState.*;
 
 @Service
 public class IndexEntryFixtures {
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java
index b071fdda..c3001f41 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/index/event/EventMigration.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.index.event;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.index.event;
 
-import org.fairdatapoint.database.mongo.repository.EventRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java
similarity index 82%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java
index bf480131..011c7512 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/MembershipMigration.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.membership;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership;
 
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.repository.MembershipRepository;
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java
index da7a9e9d..620e8f99 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/membership/data/MembershipFixtures.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.membership.data;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data;
 
-import org.fairdatapoint.entity.membership.Membership;
-import org.fairdatapoint.entity.membership.MembershipPermission;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.entity.membership.Membership;
+import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java
similarity index 85%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java
index 04256632..1682cb87 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/MetadataMigration.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.metadata;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata;
 
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.repository.MetadataRepository;
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java
index ffe5896f..b6577a30 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/metadata/data/MetadataFixtures.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.metadata.data;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data;
 
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java
similarity index 81%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java
index a9c5fc4c..4a793be7 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/ResourceDefinitionMigration.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.resource;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource;
 
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java
index 76ef7b11..8ec149bc 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/resource/data/ResourceDefinitionFixtures.java
@@ -20,11 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.resource.data;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data;
 
-import org.fairdatapoint.entity.resource.*;
-import org.fairdatapoint.util.KnownUUIDs;
-import org.fairdatapoint.vocabulary.FDP;
+import org.fairdatateam.fairdatapoint.entity.resource.*;
+import org.fairdatateam.fairdatapoint.entity.resource.*;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
 import org.eclipse.rdf4j.model.vocabulary.DCAT;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java
similarity index 85%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java
index ea46374d..33185ef2 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/MetadataSchemaMigration.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.schema;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema;
 
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java
index dcdde485..43ed5506 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/schema/data/MetadataSchemaFixtures.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.schema.data;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data;
 
 import lombok.SneakyThrows;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
-import org.fairdatapoint.entity.schema.MetadataSchemaType;
-import org.fairdatapoint.entity.schema.SemVer;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType;
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
@@ -35,7 +35,7 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.fairdatapoint.util.ResourceReader.loadClassResource;
+import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource;
 
 @Service
 public class MetadataSchemaFixtures {
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java
index fae061e7..ccaf45e5 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/search/SearchSavedQueryFixtures.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.search;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.search;
 
-import org.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
-import org.fairdatapoint.entity.search.SearchSavedQuery;
-import org.fairdatapoint.entity.search.SearchSavedQueryType;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java
similarity index 84%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java
index 0633db38..07f03ade 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/SettingsMigration.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.settings;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings;
 
-import org.fairdatapoint.database.mongo.migration.development.settings.data.SettingsFixtures;
-import org.fairdatapoint.database.mongo.repository.SettingsRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.data.SettingsFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java
index cf13165c..97aa5cc4 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/settings/data/SettingsFixtures.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.settings.data;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.settings.data;
 
-import org.fairdatapoint.entity.search.SearchFilterType;
-import org.fairdatapoint.entity.settings.Settings;
-import org.fairdatapoint.entity.settings.SettingsAutocompleteSource;
-import org.fairdatapoint.entity.settings.SettingsSearchFilter;
-import org.fairdatapoint.entity.settings.SettingsSearchFilterItem;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterType;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsAutocompleteSource;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilterItem;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/user/UserMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java
similarity index 83%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/user/UserMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java
index 5746df73..16597368 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/user/UserMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/UserMigration.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.user;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.user;
 
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.database.mongo.repository.UserRepository;
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java
index 3e9fbb06..7a08aa15 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/development/user/data/UserFixtures.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.development.user.data;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data;
 
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.entity.user.UserRole;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java
index 1db9a9cb..cd7b6bca 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0001_Init.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.BasicBSONObject;
 import org.bson.Document;
 import org.bson.types.BasicBSONList;
@@ -74,7 +74,7 @@ private Document createUser(String uuid, String firstName, String lastName, Stri
         user.append("email", email);
         user.append("passwordHash", "$2a$10$t2foZfp7cZFQo2u/33ZqTu2WNitBqYd2EY2tQO0/rBUdf8QfsAxyW");
         user.append("role", role);
-        user.append(FIELD_CLASS, "org.fairdatapoint.entity.user.User");
+        user.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.user.User");
         return user;
     }
 
@@ -103,7 +103,7 @@ private Document createMembership(String uuid, String name, boolean owner) {
         }
         membership.append(FIELD_PERMISSIONS, permissions);
         membership.append("allowedEntities", allowedEntities);
-        membership.append(FIELD_CLASS, "org.fairdatapoint.entity.membership.Membership");
+        membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.membership.Membership");
         return membership;
     }
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java
index 6556e85b..f427bf49 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0002_CustomMetamodel.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.Document;
 import org.eclipse.rdf4j.model.vocabulary.DCAT;
 import org.springframework.context.annotation.Profile;
@@ -52,7 +52,7 @@ public void run(MongoDatabase database) {
 
     private void updateAcl(MongoDatabase database) {
         final MongoCollection<Document> aclCol = database.getCollection("ACL");
-        aclCol.updateMany(new Document(), combine(set("className", "org.fairdatapoint.entity.metadata.Metadata")));
+        aclCol.updateMany(new Document(), combine(set("className", "org.fairdatateam.fairdatapoint.entity.metadata.Metadata")));
     }
 
     private void addResourceDefinitions(MongoDatabase database) {
@@ -131,7 +131,7 @@ private Document createDefinition(String uuid, String name, String prefix, Strin
         definition.append("child", child);
         definition.append("parentResourceDefinitionUuid", parentUuid);
         definition.append("childResourceDefinitionUuid", childUuid);
-        definition.append("_class", "org.fairdatapoint.entity.resource.ResourceDefinition");
+        definition.append("_class", "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition");
         return definition;
     }
 }
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java
index dc88c09c..565a2201 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0003_ShapeDefinition.java
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 
-import static org.fairdatapoint.util.ResourceReader.loadClassResource;
+import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource;
 
 @ChangeLog(order = "0003")
 @Profile(Profiles.PRODUCTION)
@@ -78,7 +78,7 @@ private Document createShape(String filename, String uuid, String name) throws E
         shape.append("name", name);
         shape.append("type", "INTERNAL");
         shape.append("definition", shaclDefinition);
-        shape.append("_class", "org.fairdatapoint.entity.shape.Shape");
+        shape.append("_class", "org.fairdatateam.fairdatapoint.entity.shape.Shape");
         return shape;
     }
 }
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java
index 9877b849..381ade00 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0004_ResourceDefinition.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.BasicBSONObject;
 import org.bson.Document;
 import org.bson.types.BasicBSONList;
@@ -176,7 +176,7 @@ private Document createDefinition(String uuid, String name, String prefix, List<
         definition.append("targetClassUris", classes);
         definition.append("children", children);
         definition.append("externalLinks", links);
-        definition.append(FIELD_CLASS, "org.fairdatapoint.entity.resource.ResourceDefinition");
+        definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition");
         return definition;
     }
 
@@ -205,7 +205,7 @@ private Document createMembership(String uuid, String name, boolean owner) {
         }
         membership.append(FIELD_PERMISSIONS, permissions);
         membership.append("allowedEntities", allowedEntities);
-        membership.append(FIELD_CLASS, "org.fairdatapoint.entity.membership.Membership");
+        membership.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.membership.Membership");
         return membership;
     }
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java
index 1bda0b1c..f25e2c00 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0005_UpdateShapeDefinition.java
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 
-import static org.fairdatapoint.util.ResourceReader.loadClassResource;
+import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource;
 
 @ChangeLog(order = "0005")
 @Profile(Profiles.PRODUCTION)
@@ -87,7 +87,7 @@ private Document createShape(String filename, String uuid, String name) throws E
         shape.append("name", name);
         shape.append("type", "INTERNAL");
         shape.append("definition", shaclDefinition);
-        shape.append("_class", "org.fairdatapoint.entity.shape.Shape");
+        shape.append("_class", "org.fairdatateam.fairdatapoint.entity.shape.Shape");
         return shape;
     }
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java
index 2fb0e104..2ee3bd96 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0006_ShapesSharing.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
@@ -28,7 +28,7 @@
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Updates;
-import org.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.Profiles;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java
index bf5f60d8..f8e0a4d9 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0007_RemoveMongobee.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
 import com.mongodb.client.MongoDatabase;
-import org.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.Profiles;
 import org.springframework.context.annotation.Profile;
 
 @ChangeLog(order = "0007")
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java
index 794f7351..5dc7022f 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0008_ShapesInternalChange.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
@@ -28,8 +28,8 @@
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Updates;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java
index bac57e02..e5e8bfc4 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0009_ShapeTargetClasses.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
@@ -28,10 +28,10 @@
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Updates;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import org.fairdatapoint.service.schema.MetadataSchemaShaclUtils;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
+import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java
index 9b016e4d..1b7066df 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0010_FixShapeXsdPrefix.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
@@ -28,7 +28,7 @@
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Updates;
-import org.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.Profiles;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java
index d1040e56..9291b1f1 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0011_ComplyFDPO.java
@@ -20,24 +20,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.github.cloudyrock.mongock.ChangeLog;
 import com.github.cloudyrock.mongock.ChangeSet;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import org.fairdatapoint.util.KnownUUIDs;
-import org.fairdatapoint.vocabulary.FDP;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
 import org.bson.Document;
 import org.eclipse.rdf4j.model.vocabulary.DCAT;
 import org.springframework.context.annotation.Profile;
 
 import java.util.*;
 
-import static org.fairdatapoint.util.ResourceReader.loadClassResource;
+import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource;
 
 @ChangeLog(order = "0011")
 @Profile(Profiles.PRODUCTION)
@@ -92,7 +92,7 @@ private Document createShape(String filename, String uuid, String name, List<Str
         shape.append("type", "INTERNAL");
         shape.append("definition", shaclDefinition);
         shape.append("targetClasses", classes);
-        shape.append(FIELD_CLASS, "org.fairdatapoint.entity.shape.Shape");
+        shape.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.shape.Shape");
         return shape;
     }
 
@@ -132,7 +132,7 @@ private Document fdpResourceDefinition() {
         // External Links
         definition.append("externalLinks", List.of());
 
-        definition.append(FIELD_CLASS, "org.fairdatapoint.entity.resource.ResourceDefinition");
+        definition.append(FIELD_CLASS, "org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition");
         return definition;
     }
 }
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java
index ae3af9bc..6bd9d4ec 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0012_MetadataSchemas.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
@@ -28,12 +28,12 @@
 import io.mongock.api.annotations.ChangeUnit;
 import io.mongock.api.annotations.Execution;
 import io.mongock.api.annotations.RollbackExecution;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.entity.schema.SemVer;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import org.fairdatapoint.service.schema.MetadataSchemaShaclUtils;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
+import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.mongodb.core.MongoTemplate;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java
index 376d916c..79b3321c 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0013_ComplexSearch.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
@@ -28,8 +28,8 @@
 import io.mongock.api.annotations.ChangeUnit;
 import io.mongock.api.annotations.Execution;
 import io.mongock.api.annotations.RollbackExecution;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsCache;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.mongodb.core.MongoTemplate;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java
index ef3138c9..74609720 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0014_FormsAutocomplete.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
@@ -28,8 +28,8 @@
 import io.mongock.api.annotations.ChangeUnit;
 import io.mongock.api.annotations.Execution;
 import io.mongock.api.annotations.RollbackExecution;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsCache;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.mongodb.core.MongoTemplate;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java
index 334786cb..aa3a7d0e 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0015_FixMetadataVersion.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
@@ -28,9 +28,9 @@
 import io.mongock.api.annotations.ChangeUnit;
 import io.mongock.api.annotations.Execution;
 import io.mongock.api.annotations.RollbackExecution;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.entity.schema.SemVer;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.mongodb.core.MongoTemplate;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java
index 6a205e41..cc28c794 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/migration/production/Migration_0016_FixSchemas.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.migration.production;
+package org.fairdatateam.fairdatapoint.database.mongo.migration.production;
 
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
@@ -29,14 +29,14 @@
 import io.mongock.api.annotations.Execution;
 import io.mongock.api.annotations.RollbackExecution;
 import lombok.SneakyThrows;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.bson.Document;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.mongodb.core.MongoTemplate;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.ResourceReader.loadClassResource;
+import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource;
 
 @ChangeUnit(
         id = "Migration_0016_FixSchemas",
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/ApiKeyRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ApiKeyRepository.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/ApiKeyRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ApiKeyRepository.java
index 02161c4f..d3671fb3 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/ApiKeyRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ApiKeyRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/EventRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java
similarity index 86%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/EventRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java
index 4fbb75d3..54cb50d2 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/EventRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/EventRepository.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.event.EventType;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.event.EventType;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/IndexEntryRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexEntryRepository.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/IndexEntryRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexEntryRepository.java
index 5e38f5b2..2905339d 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/IndexEntryRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexEntryRepository.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.entity.index.entry.IndexEntryState;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java
index 9ee87a12..efc61042 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/IndexSettingsRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/MembershipRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MembershipRepository.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/MembershipRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MembershipRepository.java
index ada08778..221d8ed0 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/MembershipRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MembershipRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatateam.fairdatapoint.entity.membership.Membership;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/MetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataRepository.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/MetadataRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataRepository.java
index 471b25d1..e669cb01 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/MetadataRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java
index 756d79dd..dccb867f 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaDraftRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java
index cab83a12..2898c681 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/MetadataSchemaRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java
index 910ac979..8f36a828 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/ResourceDefinitionRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java
index a8510625..1f35ef52 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SearchSavedQueryRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/SettingsRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SettingsRepository.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/SettingsRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SettingsRepository.java
index 61d66caa..71d830fa 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/SettingsRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/SettingsRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/UserRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/UserRepository.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/UserRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/UserRepository.java
index 3625a23c..bd7d2609 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/UserRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/UserRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/org/fairdatapoint/database/mongo/repository/WebhookRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/database/mongo/repository/WebhookRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java
index e160fbf7..2842cb97 100644
--- a/src/main/java/org/fairdatapoint/database/mongo/repository/WebhookRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/mongo/repository/WebhookRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.mongo.repository;
+package org.fairdatateam.fairdatapoint.database.mongo.repository;
 
-import org.fairdatapoint.entity.index.webhook.Webhook;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java
index 91dc662b..97d1089a 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.development;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.development;
 
 import jakarta.annotation.PostConstruct;
-import org.fairdatapoint.Profiles;
-import org.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration;
+import org.fairdatateam.fairdatapoint.Profiles;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Profile;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
similarity index 79%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
index 862e29f1..8369d061 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.development.metadata;
-
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.database.common.migration.Migration;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import org.fairdatapoint.entity.metadata.MetadataState;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.metadata.common.MetadataService;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.metadata.state.MetadataStateService;
-import org.fairdatapoint.service.security.MongoAuthenticationService;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata;
+
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.database.common.migration.Migration;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService;
+import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,8 +43,8 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class RdfMetadataMigration implements Migration {
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
index 9d42b3ca..e0e0f2ee 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.development.metadata.data;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data;
 
-import org.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
index 63c96cc6..f04624b1 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.development.metadata.factory;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
index 6f921504..f70b6e5c 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.development.metadata.factory;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory;
 
-import org.fairdatapoint.entity.metadata.Agent;
-import org.fairdatapoint.util.ValueFactoryHelper;
+import org.fairdatateam.fairdatapoint.entity.metadata.Agent;
+import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.impl.LinkedHashModel;
@@ -33,9 +33,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 
 @Service
 public class MetadataFactoryImpl implements MetadataFactory {
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
index bc175ecc..d31bd413 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.production;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.production;
 
 import com.mongodb.client.MongoCollection;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.service.reset.FactoryDefaults;
+import org.fairdatateam.fairdatapoint.service.reset.FactoryDefaults;
 import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
 import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.bson.Document;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
index 01c4f149..df551f7f 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.production;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.database.mongo.repository.MetadataRepository;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
 import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.eclipse.rdf4j.model.Resource;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
index 0241074b..3f81c18c 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.production;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.vocabulary.FDP;
-import org.fairdatapoint.vocabulary.R3D;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
+import org.fairdatateam.fairdatapoint.vocabulary.R3D;
 import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
 import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.eclipse.rdf4j.model.IRI;
@@ -41,8 +41,8 @@
 
 import java.util.List;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.s;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s;
 
 @RdfMigrationAnnotation(
         number = 3,
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
index 2aad2280..207c19b5 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.production;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.config.properties.InstanceProperties;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
 import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
 import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.eclipse.rdf4j.model.Value;
@@ -37,7 +37,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @RdfMigrationAnnotation(
         number = 4,
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
index 61904304..19972d6a 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.migration.production;
+package org.fairdatateam.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.vocabulary.DCAT3;
+import org.fairdatateam.fairdatapoint.vocabulary.DCAT3;
 import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
 import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.eclipse.rdf4j.model.Statement;
@@ -35,7 +35,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.s;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s;
 
 @RdfMigrationAnnotation(
         number = 5,
diff --git a/src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
similarity index 83%
rename from src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
index bb0a6b38..d19ac7d5 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.repository.catalog;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.catalog;
 
-import org.fairdatapoint.database.rdf.repository.common.MetadataRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.common.MetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import org.eclipse.rdf4j.model.IRI;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
similarity index 86%
rename from src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
index e6a38c0a..e634b026 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.repository.catalog;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.catalog;
 
 import jakarta.annotation.PostConstruct;
-import org.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import org.eclipse.rdf4j.model.IRI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
@@ -35,8 +35,8 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static org.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service("catalogMetadataRepository")
 public class CatalogMetadataRepositoryImpl extends AbstractMetadataRepository implements CatalogMetadataRepository {
diff --git a/src/main/java/org/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
index 4147c869..dc8d93d4 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.repository.common;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.common;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.search.SearchFilterValue;
-import org.fairdatapoint.entity.search.SearchResult;
-import org.fairdatapoint.entity.search.SearchResultRelation;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterValue;
+import org.fairdatateam.fairdatapoint.entity.search.SearchResult;
+import org.fairdatateam.fairdatapoint.entity.search.SearchResultRelation;
 import org.eclipse.rdf4j.common.iteration.Iterations;
 import org.eclipse.rdf4j.model.*;
 import org.eclipse.rdf4j.query.BindingSet;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
index 585a852f..1e3d7d7c 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
@@ -25,11 +25,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.database.rdf.repository.common;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.common;
 
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.search.SearchFilterValue;
-import org.fairdatapoint.entity.search.SearchResult;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterValue;
+import org.fairdatateam.fairdatapoint.entity.search.SearchResult;
 import org.eclipse.rdf4j.model.*;
 import org.eclipse.rdf4j.query.BindingSet;
 
diff --git a/src/main/java/org/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
index c217d5cd..5dab2b58 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.database.rdf.repository.exception;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.exception;
 
 public class MetadataRepositoryException extends Exception {
 
diff --git a/src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
index 7f190e2e..6f8af254 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.repository.generic;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.generic;
 
-import org.fairdatapoint.database.rdf.repository.common.MetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.common.MetadataRepository;
 
 public interface GenericMetadataRepository extends MetadataRepository {
 }
diff --git a/src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
similarity index 86%
rename from src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
rename to src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
index 19b87105..c1c71c92 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
@@ -25,10 +25,10 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.database.rdf.repository.generic;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.generic;
 
-import org.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import org.eclipse.rdf4j.model.*;
 import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +37,8 @@
 
 import java.util.List;
 
-import static org.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getParent;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getParent;
 
 @Service("genericMetadataRepository")
 public class GenericMetadataRepositoryImpl extends AbstractMetadataRepository implements GenericMetadataRepository {
diff --git a/src/main/java/org/fairdatapoint/entity/apikey/ApiKey.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/apikey/ApiKey.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/apikey/ApiKey.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/apikey/ApiKey.java
index b73fc9e2..2a80b640 100644
--- a/src/main/java/org/fairdatapoint/entity/apikey/ApiKey.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/apikey/ApiKey.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.apikey;
+package org.fairdatateam.fairdatapoint.entity.apikey;
 
 import lombok.*;
 import org.bson.types.ObjectId;
diff --git a/src/main/java/org/fairdatapoint/entity/exception/FeatureDisabledException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/FeatureDisabledException.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/exception/FeatureDisabledException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/exception/FeatureDisabledException.java
index f3d7ac59..b684e780 100644
--- a/src/main/java/org/fairdatapoint/entity/exception/FeatureDisabledException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/FeatureDisabledException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.exception;
+package org.fairdatateam.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/org/fairdatapoint/entity/exception/ForbiddenException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ForbiddenException.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/exception/ForbiddenException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ForbiddenException.java
index 1adbb3b9..28a704a0 100644
--- a/src/main/java/org/fairdatapoint/entity/exception/ForbiddenException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ForbiddenException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.exception;
+package org.fairdatateam.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/org/fairdatapoint/entity/exception/MetadataSchemaImportException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/MetadataSchemaImportException.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/exception/MetadataSchemaImportException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/exception/MetadataSchemaImportException.java
index 8401ae2e..59ae9d3a 100644
--- a/src/main/java/org/fairdatapoint/entity/exception/MetadataSchemaImportException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/MetadataSchemaImportException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.exception;
+package org.fairdatateam.fairdatapoint.entity.exception;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/exception/RdfValidationException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/RdfValidationException.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/exception/RdfValidationException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/exception/RdfValidationException.java
index 8d499dd6..f02326fa 100644
--- a/src/main/java/org/fairdatapoint/entity/exception/RdfValidationException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/RdfValidationException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.exception;
+package org.fairdatateam.fairdatapoint.entity.exception;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/exception/ResourceNotFoundException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ResourceNotFoundException.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/exception/ResourceNotFoundException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ResourceNotFoundException.java
index a87173f2..d70787c6 100644
--- a/src/main/java/org/fairdatapoint/entity/exception/ResourceNotFoundException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ResourceNotFoundException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.exception;
+package org.fairdatateam.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/org/fairdatapoint/entity/exception/UnauthorizedException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/UnauthorizedException.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/exception/UnauthorizedException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/exception/UnauthorizedException.java
index 9dc9f8e5..e5f8d12c 100644
--- a/src/main/java/org/fairdatapoint/entity/exception/UnauthorizedException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/UnauthorizedException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.exception;
+package org.fairdatateam.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/org/fairdatapoint/entity/exception/ValidationException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ValidationException.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/exception/ValidationException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ValidationException.java
index 7f5d275f..100ac4bb 100644
--- a/src/main/java/org/fairdatapoint/entity/exception/ValidationException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/exception/ValidationException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.exception;
+package org.fairdatateam.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/org/fairdatapoint/entity/forms/RdfEntityCacheContainer.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
index 27d0638f..e326bc92 100644
--- a/src/main/java/org/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.forms;
+package org.fairdatateam.fairdatapoint.entity.forms;
 
 import lombok.*;
-import org.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
+import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/entity/forms/RdfEntitySourceType.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntitySourceType.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/forms/RdfEntitySourceType.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntitySourceType.java
index cd939c1f..0c665a6a 100644
--- a/src/main/java/org/fairdatapoint/entity/forms/RdfEntitySourceType.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/forms/RdfEntitySourceType.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.forms;
+package org.fairdatateam.fairdatapoint.entity.forms;
 
 public enum RdfEntitySourceType {
     SPARQL,
diff --git a/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntry.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntry.java
index 60503cb6..7edc15e3 100644
--- a/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntry.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.entry;
+package org.fairdatateam.fairdatapoint.entity.index.entry;
 
 import lombok.*;
 import org.bson.types.ObjectId;
diff --git a/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryState.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryState.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryState.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryState.java
index 1e7d8f10..c83fd576 100644
--- a/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryState.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/IndexEntryState.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.entry;
+package org.fairdatateam.fairdatapoint.entity.index.entry;
 
 public enum IndexEntryState {
     Unknown,
diff --git a/src/main/java/org/fairdatapoint/entity/index/entry/RepositoryMetadata.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/RepositoryMetadata.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/index/entry/RepositoryMetadata.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/RepositoryMetadata.java
index 2c07d2b0..01813afb 100644
--- a/src/main/java/org/fairdatapoint/entity/index/entry/RepositoryMetadata.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/entry/RepositoryMetadata.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.entry;
+package org.fairdatateam.fairdatapoint.entity.index.entry;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/entity/index/event/AdminTrigger.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/AdminTrigger.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/event/AdminTrigger.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/AdminTrigger.java
index f9bc8c85..63fc551b 100644
--- a/src/main/java/org/fairdatapoint/entity/index/event/AdminTrigger.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/AdminTrigger.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.event;
+package org.fairdatateam.fairdatapoint.entity.index.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/org/fairdatapoint/entity/index/event/Event.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/Event.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/index/event/Event.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/Event.java
index 7f6c968b..18a4f665 100644
--- a/src/main/java/org/fairdatapoint/entity/index/event/Event.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/Event.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.event;
+package org.fairdatateam.fairdatapoint.entity.index.event;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.DBRef;
diff --git a/src/main/java/org/fairdatapoint/entity/index/event/EventType.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/EventType.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/event/EventType.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/EventType.java
index 080fbd91..de60c4a8 100644
--- a/src/main/java/org/fairdatapoint/entity/index/event/EventType.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/EventType.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.event;
+package org.fairdatateam.fairdatapoint.entity.index.event;
 
 public enum EventType {
     AdminTrigger,
diff --git a/src/main/java/org/fairdatapoint/entity/index/event/IncomingPing.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/IncomingPing.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/entity/index/event/IncomingPing.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/IncomingPing.java
index 1742765a..e6c57567 100644
--- a/src/main/java/org/fairdatapoint/entity/index/event/IncomingPing.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/IncomingPing.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.event;
+package org.fairdatateam.fairdatapoint.entity.index.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatateam.fairdatapoint.entity.index.http.Exchange;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/entity/index/event/MetadataRetrieval.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/MetadataRetrieval.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/entity/index/event/MetadataRetrieval.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/MetadataRetrieval.java
index 185cff2d..5dcac07a 100644
--- a/src/main/java/org/fairdatapoint/entity/index/event/MetadataRetrieval.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/MetadataRetrieval.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.event;
+package org.fairdatateam.fairdatapoint.entity.index.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.fairdatapoint.entity.index.entry.RepositoryMetadata;
-import org.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata;
+import org.fairdatateam.fairdatapoint.entity.index.http.Exchange;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/entity/index/event/WebhookPing.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookPing.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/index/event/WebhookPing.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookPing.java
index 66506a42..32ce9400 100644
--- a/src/main/java/org/fairdatapoint/entity/index/event/WebhookPing.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookPing.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.event;
+package org.fairdatateam.fairdatapoint.entity.index.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/org/fairdatapoint/entity/index/event/WebhookTrigger.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookTrigger.java
similarity index 84%
rename from src/main/java/org/fairdatapoint/entity/index/event/WebhookTrigger.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookTrigger.java
index 194658fd..f4b201a5 100644
--- a/src/main/java/org/fairdatapoint/entity/index/event/WebhookTrigger.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/event/WebhookTrigger.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.event;
+package org.fairdatateam.fairdatapoint.entity.index.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.fairdatapoint.entity.index.http.Exchange;
-import org.fairdatapoint.entity.index.webhook.Webhook;
-import org.fairdatapoint.entity.index.webhook.WebhookEvent;
+import org.fairdatateam.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
 @Data
diff --git a/src/main/java/org/fairdatapoint/entity/index/exception/AbstractIndexException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/AbstractIndexException.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/entity/index/exception/AbstractIndexException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/AbstractIndexException.java
index 195957cc..f2b743ef 100644
--- a/src/main/java/org/fairdatapoint/entity/index/exception/AbstractIndexException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/AbstractIndexException.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.exception;
+package org.fairdatateam.fairdatapoint.entity.index.exception;
 
-import org.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
 import org.springframework.http.HttpStatus;
 
 public abstract class AbstractIndexException extends RuntimeException {
diff --git a/src/main/java/org/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
index 67f9613a..79cc8318 100644
--- a/src/main/java/org/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.exception;
+package org.fairdatateam.fairdatapoint.entity.index.exception;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/org/fairdatapoint/entity/index/exception/PingDeniedException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/PingDeniedException.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/exception/PingDeniedException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/PingDeniedException.java
index 4d0d820a..ed5a2710 100644
--- a/src/main/java/org/fairdatapoint/entity/index/exception/PingDeniedException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/PingDeniedException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.exception;
+package org.fairdatateam.fairdatapoint.entity.index.exception;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/org/fairdatapoint/entity/index/exception/RateLimitException.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/RateLimitException.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/exception/RateLimitException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/RateLimitException.java
index ecdba95f..a4b1b0ab 100644
--- a/src/main/java/org/fairdatapoint/entity/index/exception/RateLimitException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/exception/RateLimitException.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.exception;
+package org.fairdatateam.fairdatapoint.entity.index.exception;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/org/fairdatapoint/entity/index/http/Exchange.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Exchange.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/index/http/Exchange.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Exchange.java
index 82516ce6..0b6c8981 100644
--- a/src/main/java/org/fairdatapoint/entity/index/http/Exchange.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Exchange.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.http;
+package org.fairdatateam.fairdatapoint.entity.index.http;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/org/fairdatapoint/entity/index/http/ExchangeDirection.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeDirection.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/http/ExchangeDirection.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeDirection.java
index 50542ea9..78e6fd94 100644
--- a/src/main/java/org/fairdatapoint/entity/index/http/ExchangeDirection.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeDirection.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.http;
+package org.fairdatateam.fairdatapoint.entity.index.http;
 
 public enum ExchangeDirection {
     INCOMING,
diff --git a/src/main/java/org/fairdatapoint/entity/index/http/ExchangeState.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeState.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/http/ExchangeState.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeState.java
index b2a345d8..87842a60 100644
--- a/src/main/java/org/fairdatapoint/entity/index/http/ExchangeState.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/ExchangeState.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.http;
+package org.fairdatateam.fairdatapoint.entity.index.http;
 
 public enum ExchangeState {
     Prepared,
diff --git a/src/main/java/org/fairdatapoint/entity/index/http/Request.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Request.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/index/http/Request.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Request.java
index ffd2f276..82439774 100644
--- a/src/main/java/org/fairdatapoint/entity/index/http/Request.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Request.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.http;
+package org.fairdatateam.fairdatapoint.entity.index.http;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/entity/index/http/Response.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Response.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/index/http/Response.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Response.java
index 822b7d71..23dc904e 100644
--- a/src/main/java/org/fairdatapoint/entity/index/http/Response.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/http/Response.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.http;
+package org.fairdatateam.fairdatapoint.entity.index.http;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/org/fairdatapoint/entity/index/settings/IndexSettings.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettings.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/index/settings/IndexSettings.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettings.java
index 7b8d796c..82937670 100644
--- a/src/main/java/org/fairdatapoint/entity/index/settings/IndexSettings.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettings.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.settings;
+package org.fairdatateam.fairdatapoint.entity.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/entity/index/settings/IndexSettingsPing.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsPing.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/index/settings/IndexSettingsPing.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsPing.java
index d9689637..2e9a2424 100644
--- a/src/main/java/org/fairdatapoint/entity/index/settings/IndexSettingsPing.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsPing.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.settings;
+package org.fairdatateam.fairdatapoint.entity.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java
index 5d381896..936dbe9f 100644
--- a/src/main/java/org/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.settings;
+package org.fairdatateam.fairdatapoint.entity.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/entity/index/webhook/Webhook.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/Webhook.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/index/webhook/Webhook.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/Webhook.java
index b85fa892..364609e0 100644
--- a/src/main/java/org/fairdatapoint/entity/index/webhook/Webhook.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/Webhook.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.webhook;
+package org.fairdatateam.fairdatapoint.entity.index.webhook;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/fairdatapoint/entity/index/webhook/WebhookEvent.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/WebhookEvent.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/index/webhook/WebhookEvent.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/WebhookEvent.java
index 286f992d..a2e4a23e 100644
--- a/src/main/java/org/fairdatapoint/entity/index/webhook/WebhookEvent.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/index/webhook/WebhookEvent.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.index.webhook;
+package org.fairdatateam.fairdatapoint.entity.index.webhook;
 
 public enum WebhookEvent {
     NewEntry,
diff --git a/src/main/java/org/fairdatapoint/entity/membership/Membership.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/Membership.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/membership/Membership.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/membership/Membership.java
index 9ae0105e..1fefc3b5 100644
--- a/src/main/java/org/fairdatapoint/entity/membership/Membership.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/Membership.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.membership;
+package org.fairdatateam.fairdatapoint.entity.membership;
 
 import lombok.*;
 import org.bson.types.ObjectId;
diff --git a/src/main/java/org/fairdatapoint/entity/membership/MembershipPermission.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/MembershipPermission.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/membership/MembershipPermission.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/membership/MembershipPermission.java
index ce5ed749..9e9b4fab 100644
--- a/src/main/java/org/fairdatapoint/entity/membership/MembershipPermission.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/membership/MembershipPermission.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.membership;
+package org.fairdatateam.fairdatapoint.entity.membership;
 
 import lombok.*;
 import org.bson.types.ObjectId;
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/AccessRights.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/AccessRights.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/metadata/AccessRights.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/AccessRights.java
index 848c8bb7..8bbbac3e 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/AccessRights.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/AccessRights.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/Agent.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Agent.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/metadata/Agent.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Agent.java
index c6686d47..bf6e60a4 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/Agent.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Agent.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/Authorization.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Authorization.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/metadata/Authorization.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Authorization.java
index 52447f1d..0f425aba 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/Authorization.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Authorization.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/Identifier.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Identifier.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/metadata/Identifier.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Identifier.java
index 5cc542e6..d1642f59 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/Identifier.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Identifier.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/Metadata.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metadata.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/metadata/Metadata.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metadata.java
index edf9ee02..388d9b0d 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/Metadata.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metadata.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
 import lombok.*;
 import org.bson.types.ObjectId;
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/MetadataGetter.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataGetter.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/entity/metadata/MetadataGetter.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataGetter.java
index 7005205a..361e96ac 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/MetadataGetter.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataGetter.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
-import org.fairdatapoint.util.ValueFactoryHelper;
-import org.fairdatapoint.vocabulary.FDP;
+import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Model;
@@ -37,9 +37,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.fairdatapoint.util.RdfUtil.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.*;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 
 public class MetadataGetter {
 
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/MetadataSetter.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataSetter.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/entity/metadata/MetadataSetter.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataSetter.java
index 9d09292d..0f569444 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/MetadataSetter.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataSetter.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
-import org.fairdatapoint.vocabulary.DCAT3;
-import org.fairdatapoint.vocabulary.FDP;
-import org.fairdatapoint.vocabulary.Sio;
+import org.fairdatateam.fairdatapoint.vocabulary.DCAT3;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
+import org.fairdatateam.fairdatapoint.vocabulary.Sio;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Model;
@@ -32,9 +32,9 @@
 
 import java.util.List;
 
-import static org.fairdatapoint.util.RdfUtil.update;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.update;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 
 public class MetadataSetter {
 
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/MetadataState.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataState.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/metadata/MetadataState.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataState.java
index 2b8d03e4..061c3e01 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/MetadataState.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/MetadataState.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
 public enum MetadataState {
 
diff --git a/src/main/java/org/fairdatapoint/entity/metadata/Metric.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metric.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/metadata/Metric.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metric.java
index 9c4cab2f..4eeadf27 100644
--- a/src/main/java/org/fairdatapoint/entity/metadata/Metric.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/metadata/Metric.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.entity.metadata;
+package org.fairdatateam.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinition.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinition.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/resource/ResourceDefinition.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinition.java
index 6eb5017b..5213f10e 100644
--- a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinition.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinition.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.resource;
+package org.fairdatateam.fairdatapoint.entity.resource;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChild.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChild.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChild.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChild.java
index 39ee4bdd..9631fe2a 100644
--- a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChild.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChild.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.resource;
+package org.fairdatateam.fairdatapoint.entity.resource;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
-import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatateam.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java
index 0e3c785a..fea00f4e 100644
--- a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.resource;
+package org.fairdatateam.fairdatapoint.entity.resource;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
-import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatateam.fairdatapoint.api.validator.ValidIri;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java
index 7b94f849..a5273590 100644
--- a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.resource;
+package org.fairdatateam.fairdatapoint.entity.resource;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
-import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatateam.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionLink.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionLink.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionLink.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionLink.java
index 71a9ab6a..52838aab 100644
--- a/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionLink.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/resource/ResourceDefinitionLink.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.resource;
+package org.fairdatateam.fairdatapoint.entity.resource;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
-import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatateam.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/org/fairdatapoint/entity/schema/MetadataSchema.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java
similarity index 98%
rename from src/main/java/org/fairdatapoint/entity/schema/MetadataSchema.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java
index 424ac4d2..81794dd0 100644
--- a/src/main/java/org/fairdatapoint/entity/schema/MetadataSchema.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchema.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.schema;
+package org.fairdatateam.fairdatapoint.entity.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaDraft.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaDraft.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaDraft.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaDraft.java
index b61d9aed..89ddc1de 100644
--- a/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaDraft.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaDraft.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.schema;
+package org.fairdatateam.fairdatapoint.entity.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaType.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaType.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaType.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaType.java
index 9cb3608d..4874d323 100644
--- a/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaType.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/MetadataSchemaType.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.schema;
+package org.fairdatateam.fairdatapoint.entity.schema;
 
 public enum MetadataSchemaType {
     INTERNAL, CUSTOM, REFERENCE
diff --git a/src/main/java/org/fairdatapoint/entity/schema/SemVer.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/SemVer.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/schema/SemVer.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/schema/SemVer.java
index e649ff10..abcb78ea 100644
--- a/src/main/java/org/fairdatapoint/entity/schema/SemVer.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/schema/SemVer.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.schema;
+package org.fairdatateam.fairdatapoint.entity.schema;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/entity/search/SearchFilterCacheContainer.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterCacheContainer.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/search/SearchFilterCacheContainer.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterCacheContainer.java
index 039e69bf..cda73331 100644
--- a/src/main/java/org/fairdatapoint/entity/search/SearchFilterCacheContainer.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterCacheContainer.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.search;
+package org.fairdatateam.fairdatapoint.entity.search;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/search/SearchFilterType.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterType.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/search/SearchFilterType.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterType.java
index 31cf3ceb..b0cd93d6 100644
--- a/src/main/java/org/fairdatapoint/entity/search/SearchFilterType.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterType.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.search;
+package org.fairdatateam.fairdatapoint.entity.search;
 
 public enum SearchFilterType {
     IRI,
diff --git a/src/main/java/org/fairdatapoint/entity/search/SearchFilterValue.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterValue.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/search/SearchFilterValue.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterValue.java
index 853394c7..aa658a11 100644
--- a/src/main/java/org/fairdatapoint/entity/search/SearchFilterValue.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchFilterValue.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.search;
+package org.fairdatateam.fairdatapoint.entity.search;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/search/SearchResult.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResult.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/search/SearchResult.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResult.java
index 5fd7634b..fd486088 100644
--- a/src/main/java/org/fairdatapoint/entity/search/SearchResult.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResult.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.search;
+package org.fairdatateam.fairdatapoint.entity.search;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/fairdatapoint/entity/search/SearchResultRelation.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResultRelation.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/search/SearchResultRelation.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResultRelation.java
index 1ecb605b..f6657f14 100644
--- a/src/main/java/org/fairdatapoint/entity/search/SearchResultRelation.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchResultRelation.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.search;
+package org.fairdatateam.fairdatapoint.entity.search;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQuery.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQuery.java
index 0bbf023f..ab40f8e3 100644
--- a/src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQuery.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.search;
+package org.fairdatateam.fairdatapoint.entity.search;
 
 import lombok.*;
-import org.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/src/main/java/org/fairdatapoint/entity/search/SearchSavedQueryType.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQueryType.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/search/SearchSavedQueryType.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQueryType.java
index 2bcecd4d..7d4ffc94 100644
--- a/src/main/java/org/fairdatapoint/entity/search/SearchSavedQueryType.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/search/SearchSavedQueryType.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.search;
+package org.fairdatateam.fairdatapoint.entity.search;
 
 public enum SearchSavedQueryType {
     PUBLIC,
diff --git a/src/main/java/org/fairdatapoint/entity/settings/Settings.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/Settings.java
similarity index 98%
rename from src/main/java/org/fairdatapoint/entity/settings/Settings.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/settings/Settings.java
index 1d06e305..92d43372 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/Settings.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/Settings.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.settings;
+package org.fairdatateam.fairdatapoint.entity.settings;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/entity/settings/SettingsAutocompleteSource.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
index 53fe546f..1b03148a 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.settings;
+package org.fairdatateam.fairdatapoint.entity.settings;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/entity/settings/SettingsForms.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsForms.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/settings/SettingsForms.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsForms.java
index 4cc49c7c..675cf99e 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/SettingsForms.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsForms.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.settings;
+package org.fairdatateam.fairdatapoint.entity.settings;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java
index 99835d58..01866f99 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsFormsAutocomplete.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.settings;
+package org.fairdatateam.fairdatapoint.entity.settings;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/entity/settings/SettingsMetricsEntry.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsMetricsEntry.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/settings/SettingsMetricsEntry.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsMetricsEntry.java
index 8dd42549..11c31997 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/SettingsMetricsEntry.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsMetricsEntry.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.settings;
+package org.fairdatateam.fairdatapoint.entity.settings;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/entity/settings/SettingsPing.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsPing.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/settings/SettingsPing.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsPing.java
index c8508c53..29fb8dd4 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/SettingsPing.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsPing.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.settings;
+package org.fairdatateam.fairdatapoint.entity.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java
index 764d085a..8553004f 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilter.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.settings;
+package org.fairdatateam.fairdatapoint.entity.settings;
 
 import lombok.*;
-import org.fairdatapoint.entity.search.SearchFilterType;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterType;
 
 import java.util.List;
 
diff --git a/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilterItem.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
index a0c2bfa3..7f283a3c 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.settings;
+package org.fairdatateam.fairdatapoint.entity.settings;
 
 import lombok.*;
 
diff --git a/src/main/java/org/fairdatapoint/entity/user/User.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/user/User.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/entity/user/User.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/user/User.java
index bf4e70b3..1a09f32f 100644
--- a/src/main/java/org/fairdatapoint/entity/user/User.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/user/User.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.user;
+package org.fairdatateam.fairdatapoint.entity.user;
 
 import lombok.*;
 import org.bson.types.ObjectId;
diff --git a/src/main/java/org/fairdatapoint/entity/user/UserPermission.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserPermission.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/entity/user/UserPermission.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserPermission.java
index c9dfe4ed..653790b0 100644
--- a/src/main/java/org/fairdatapoint/entity/user/UserPermission.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserPermission.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.user;
+package org.fairdatateam.fairdatapoint.entity.user;
 
 import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.model.Permission;
diff --git a/src/main/java/org/fairdatapoint/entity/user/UserRole.java b/src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserRole.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/entity/user/UserRole.java
rename to src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserRole.java
index 6380f12c..9ff3947f 100644
--- a/src/main/java/org/fairdatapoint/entity/user/UserRole.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/entity/user/UserRole.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.user;
+package org.fairdatateam.fairdatapoint.entity.user;
 
 public enum UserRole {
 
diff --git a/src/main/java/org/fairdatapoint/service/UtilityService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/UtilityService.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/UtilityService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/UtilityService.java
index cb8f1f01..8b3e0628 100644
--- a/src/main/java/org/fairdatapoint/service/UtilityService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/UtilityService.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service;
+package org.fairdatateam.fairdatapoint.service;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.fairdatapoint.config.properties.InstanceProperties;
-import org.fairdatapoint.util.HttpUtil;
+import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatateam.fairdatapoint.util.HttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/actuator/AppInfoContributor.java b/src/main/java/org/fairdatateam/fairdatapoint/service/actuator/AppInfoContributor.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/service/actuator/AppInfoContributor.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/actuator/AppInfoContributor.java
index 87263ec6..6abb768c 100644
--- a/src/main/java/org/fairdatapoint/service/actuator/AppInfoContributor.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/actuator/AppInfoContributor.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.actuator;
+package org.fairdatateam.fairdatapoint.service.actuator;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.actuate.info.Info;
diff --git a/src/main/java/org/fairdatapoint/service/apikey/ApiKeyMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyMapper.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/service/apikey/ApiKeyMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyMapper.java
index b8d89f02..b98625e0 100644
--- a/src/main/java/org/fairdatapoint/service/apikey/ApiKeyMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyMapper.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.apikey;
+package org.fairdatateam.fairdatapoint.service.apikey;
 
-import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import org.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/src/main/java/org/fairdatapoint/service/apikey/ApiKeyService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java
similarity index 85%
rename from src/main/java/org/fairdatapoint/service/apikey/ApiKeyService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java
index 3725ce1e..2c1fd569 100644
--- a/src/main/java/org/fairdatapoint/service/apikey/ApiKeyService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/apikey/ApiKeyService.java
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.apikey;
+package org.fairdatateam.fairdatapoint.service.apikey;
 
-import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import org.fairdatapoint.database.mongo.repository.ApiKeyRepository;
-import org.fairdatapoint.entity.apikey.ApiKey;
-import org.fairdatapoint.entity.exception.ForbiddenException;
-import org.fairdatapoint.entity.exception.UnauthorizedException;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.entity.user.UserRole;
-import org.fairdatapoint.service.security.MongoAuthenticationService;
-import org.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ApiKeyRepository;
+import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException;
+import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService;
+import org.fairdatateam.fairdatapoint.service.user.CurrentUserService;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/org/fairdatapoint/service/config/ConfigService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java
similarity index 85%
rename from src/main/java/org/fairdatapoint/service/config/ConfigService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java
index 016b3bc1..6e44b6e1 100644
--- a/src/main/java/org/fairdatapoint/service/config/ConfigService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/config/ConfigService.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.config;
+package org.fairdatateam.fairdatapoint.service.config;
 
-import org.fairdatapoint.api.dto.config.BootstrapConfigDTO;
-import org.fairdatapoint.config.properties.InstanceProperties;
-import org.fairdatapoint.entity.settings.Settings;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
-import org.fairdatapoint.service.settings.SettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO;
+import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/fairdatapoint/service/dashboard/DashboardService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java
similarity index 76%
rename from src/main/java/org/fairdatapoint/service/dashboard/DashboardService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java
index bc090ade..487908ca 100644
--- a/src/main/java/org/fairdatapoint/service/dashboard/DashboardService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/dashboard/DashboardService.java
@@ -20,20 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.dashboard;
+package org.fairdatateam.fairdatapoint.service.dashboard;
 
-import org.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import org.fairdatapoint.service.member.MemberService;
-import org.fairdatapoint.service.metadata.common.MetadataService;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.metadata.state.MetadataStateService;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.service.member.MemberService;
+import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Value;
@@ -45,9 +45,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getTitle;
-import static org.fairdatapoint.util.RdfUtil.getObjectsBy;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getTitle;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class DashboardService {
diff --git a/src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
index 5b755d5f..c6f34377 100644
--- a/src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.form.autocomplete;
+package org.fairdatateam.fairdatapoint.service.form.autocomplete;
 
-import org.fairdatapoint.entity.forms.RdfEntityCacheContainer;
+import org.fairdatateam.fairdatapoint.entity.forms.RdfEntityCacheContainer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Component;
 
-import static org.fairdatapoint.config.CacheConfig.FORMS_AUTOCOMPLETE_CACHE;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.FORMS_AUTOCOMPLETE_CACHE;
 
 @Component
 public class FormsAutocompleteCache {
diff --git a/src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
similarity index 84%
rename from src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
index 01f83c6f..ddc19cbd 100644
--- a/src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.form.autocomplete;
+package org.fairdatateam.fairdatapoint.service.form.autocomplete;
 
-import org.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
-import org.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
-import org.fairdatapoint.entity.forms.RdfEntityCacheContainer;
-import org.fairdatapoint.entity.settings.Settings;
-import org.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesNamespaceRetriever;
-import org.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesRetriever;
-import org.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesSparqlRetriever;
-import org.fairdatapoint.service.settings.SettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
+import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
+import org.fairdatateam.fairdatapoint.entity.forms.RdfEntityCacheContainer;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesNamespaceRetriever;
+import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesRetriever;
+import org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesSparqlRetriever;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
index 5b4fb7c2..c58fd845 100644
--- a/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.form.autocomplete.retrieval;
+package org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval;
 
 import lombok.SneakyThrows;
-import org.fairdatapoint.entity.forms.RdfEntitySourceType;
+import org.fairdatateam.fairdatapoint.entity.forms.RdfEntitySourceType;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
@@ -40,8 +40,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.fairdatapoint.util.RdfUtil.getStringObjectBy;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.getStringObjectBy;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Component
 public class RdfEntitiesNamespaceRetriever implements RdfEntitiesRetriever {
diff --git a/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
index 1e702a13..47d15e57 100644
--- a/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.form.autocomplete.retrieval;
+package org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval;
 
-import org.fairdatapoint.entity.forms.RdfEntitySourceType;
+import org.fairdatateam.fairdatapoint.entity.forms.RdfEntitySourceType;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
index a259f84f..0679425d 100644
--- a/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.form.autocomplete.retrieval;
+package org.fairdatateam.fairdatapoint.service.form.autocomplete.retrieval;
 
-import org.fairdatapoint.entity.forms.RdfEntitySourceType;
-import org.fairdatapoint.entity.settings.SettingsAutocompleteSource;
-import org.fairdatapoint.service.settings.SettingsService;
+import org.fairdatateam.fairdatapoint.entity.forms.RdfEntitySourceType;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsAutocompleteSource;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
 import org.eclipse.rdf4j.repository.Repository;
diff --git a/src/main/java/org/fairdatapoint/service/index/common/IndexFeatureAspect.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/IndexFeatureAspect.java
similarity index 84%
rename from src/main/java/org/fairdatapoint/service/index/common/IndexFeatureAspect.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/common/IndexFeatureAspect.java
index fe05963f..421807e9 100644
--- a/src/main/java/org/fairdatapoint/service/index/common/IndexFeatureAspect.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/IndexFeatureAspect.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.common;
+package org.fairdatateam.fairdatapoint.service.index.common;
 
 import lombok.SneakyThrows;
-import org.fairdatapoint.config.properties.InstanceProperties;
-import org.fairdatapoint.entity.exception.FeatureDisabledException;
+import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatateam.fairdatapoint.entity.exception.FeatureDisabledException;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -39,7 +39,7 @@ public class IndexFeatureAspect {
     private InstanceProperties instanceProperties;
 
     @SneakyThrows
-    @Around("@annotation(org.fairdatapoint.service.index.common.RequiredEnabledIndexFeature)")
+    @Around("@annotation(org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature)")
     public Object logExecutionTime(ProceedingJoinPoint joinPoint) {
         if (!instanceProperties.isIndex()) {
             throw new FeatureDisabledException("Index functionality is turn off");
diff --git a/src/main/java/org/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
index 8e253537..164b2b93 100644
--- a/src/main/java/org/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.common;
+package org.fairdatateam.fairdatapoint.service.index.common;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/org/fairdatapoint/service/index/entry/IndexEntryMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryMapper.java
similarity index 85%
rename from src/main/java/org/fairdatapoint/service/index/entry/IndexEntryMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryMapper.java
index fd6da34b..54be8412 100644
--- a/src/main/java/org/fairdatapoint/service/index/entry/IndexEntryMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryMapper.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.entry;
+package org.fairdatateam.fairdatapoint.service.index.entry;
 
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.entity.index.entry.IndexEntryState;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.service.index.event.EventMapper;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.service.index.event.EventMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/index/entry/IndexEntryService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryService.java
similarity index 84%
rename from src/main/java/org/fairdatapoint/service/index/entry/IndexEntryService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryService.java
index 6ff559e1..f969c5ed 100644
--- a/src/main/java/org/fairdatapoint/service/index/entry/IndexEntryService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/entry/IndexEntryService.java
@@ -20,25 +20,25 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.entry;
+package org.fairdatateam.fairdatapoint.service.index.entry;
 
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.entity.index.entry.IndexEntryState;
-import org.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
-import org.fairdatapoint.service.index.event.EventService;
-import org.fairdatapoint.service.index.harvester.HarvesterService;
-import org.fairdatapoint.service.index.settings.IndexSettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState;
+import org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
+import org.fairdatateam.fairdatapoint.service.index.event.EventService;
+import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.impl.TreeModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,8 +52,8 @@
 import java.util.*;
 import java.util.stream.StreamSupport;
 
-import static org.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO.*;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 @Service
diff --git a/src/main/java/org/fairdatapoint/service/index/event/EventMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventMapper.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/service/index/event/EventMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventMapper.java
index 8a944517..fc8d678e 100644
--- a/src/main/java/org/fairdatapoint/service/index/event/EventMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventMapper.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.event;
+package org.fairdatateam.fairdatapoint.service.index.event;
 
-import org.fairdatapoint.api.dto.index.event.EventDTO;
-import org.fairdatapoint.entity.index.event.AdminTrigger;
-import org.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.api.dto.index.event.EventDTO;
+import org.fairdatateam.fairdatapoint.entity.index.event.AdminTrigger;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/index/event/EventService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventService.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/service/index/event/EventService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventService.java
index 26eb4835..5fbaa12e 100644
--- a/src/main/java/org/fairdatapoint/service/index/event/EventService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/EventService.java
@@ -20,33 +20,33 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.event;
+package org.fairdatateam.fairdatapoint.service.index.event;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.PostConstruct;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.database.mongo.repository.EventRepository;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.entity.index.entry.IndexEntryState;
-import org.fairdatapoint.entity.index.entry.RepositoryMetadata;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.event.EventType;
-import org.fairdatapoint.entity.index.exception.IncorrectPingFormatException;
-import org.fairdatapoint.entity.index.exception.PingDeniedException;
-import org.fairdatapoint.entity.index.exception.RateLimitException;
-import org.fairdatapoint.entity.index.http.Exchange;
-import org.fairdatapoint.entity.index.http.ExchangeState;
-import org.fairdatapoint.entity.index.settings.IndexSettingsPing;
-import org.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
-import org.fairdatapoint.service.UtilityService;
-import org.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
-import org.fairdatapoint.service.index.entry.IndexEntryService;
-import org.fairdatapoint.service.index.settings.IndexSettingsService;
-import org.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState;
+import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.event.EventType;
+import org.fairdatateam.fairdatapoint.entity.index.exception.IncorrectPingFormatException;
+import org.fairdatateam.fairdatapoint.entity.index.exception.PingDeniedException;
+import org.fairdatateam.fairdatapoint.entity.index.exception.RateLimitException;
+import org.fairdatateam.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeState;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
+import org.fairdatateam.fairdatapoint.service.UtilityService;
+import org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
+import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService;
+import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageRequest;
diff --git a/src/main/java/org/fairdatapoint/service/index/event/IncomingPingUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/IncomingPingUtils.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/service/index/event/IncomingPingUtils.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/event/IncomingPingUtils.java
index c9b7f3c3..0329eaf0 100644
--- a/src/main/java/org/fairdatapoint/service/index/event/IncomingPingUtils.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/IncomingPingUtils.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.event;
+package org.fairdatateam.fairdatapoint.service.index.event;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.event.IncomingPing;
-import org.fairdatapoint.entity.index.http.Exchange;
-import org.fairdatapoint.entity.index.http.ExchangeDirection;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.event.IncomingPing;
+import org.fairdatateam.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeDirection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/index/event/MetadataRetrievalUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
index 1e9c3e74..3a480a0d 100644
--- a/src/main/java/org/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.event;
-
-import org.fairdatapoint.entity.index.entry.RepositoryMetadata;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.event.EventType;
-import org.fairdatapoint.entity.index.event.MetadataRetrieval;
-import org.fairdatapoint.entity.index.http.Exchange;
-import org.fairdatapoint.entity.index.http.ExchangeDirection;
-import org.fairdatapoint.entity.index.http.ExchangeState;
-import org.fairdatapoint.service.index.entry.IndexEntryService;
-import org.fairdatapoint.vocabulary.DCAT3;
-import org.fairdatapoint.vocabulary.FDP;
-import org.fairdatapoint.vocabulary.R3D;
+package org.fairdatateam.fairdatapoint.service.index.event;
+
+import org.fairdatateam.fairdatapoint.entity.index.entry.RepositoryMetadata;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.event.EventType;
+import org.fairdatateam.fairdatapoint.entity.index.event.MetadataRetrieval;
+import org.fairdatateam.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeDirection;
+import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeState;
+import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatateam.fairdatapoint.vocabulary.DCAT3;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
+import org.fairdatateam.fairdatapoint.vocabulary.R3D;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
diff --git a/src/main/java/org/fairdatapoint/service/index/harvester/HarvesterService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterService.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/index/harvester/HarvesterService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterService.java
index 2e04b8d5..aab77d87 100644
--- a/src/main/java/org/fairdatapoint/service/index/harvester/HarvesterService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterService.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.harvester;
+package org.fairdatateam.fairdatapoint.service.index.harvester;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
@@ -46,13 +46,13 @@
 import java.util.Map;
 
 import static java.util.Optional.ofNullable;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getChildren;
-import static org.fairdatapoint.util.HttpUtil.getRdfContentType;
-import static org.fairdatapoint.util.RdfIOUtil.read;
-import static org.fairdatapoint.util.RdfIOUtil.readFile;
-import static org.fairdatapoint.util.RdfUtil.getObjectsBy;
-import static org.fairdatapoint.util.RdfUtil.getSubjectsBy;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getChildren;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRdfContentType;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.read;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.readFile;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.getSubjectsBy;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 @Service
diff --git a/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsMapper.java
similarity index 85%
rename from src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsMapper.java
index a409e04c..e74a53e1 100644
--- a/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsMapper.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.settings;
+package org.fairdatateam.fairdatapoint.service.index.settings;
 
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsPingDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsRetrievalDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import org.fairdatapoint.entity.index.settings.IndexSettings;
-import org.fairdatapoint.entity.index.settings.IndexSettingsPing;
-import org.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsPingDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsRetrievalDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
diff --git a/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsService.java
similarity index 82%
rename from src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsService.java
index d9f137b1..9daada34 100644
--- a/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/settings/IndexSettingsService.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.settings;
+package org.fairdatateam.fairdatapoint.service.index.settings;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import org.fairdatapoint.database.mongo.repository.IndexSettingsRepository;
-import org.fairdatapoint.entity.index.settings.IndexSettings;
-import org.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/index/webhook/WebhookMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookMapper.java
similarity index 84%
rename from src/main/java/org/fairdatapoint/service/index/webhook/WebhookMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookMapper.java
index a9a17780..3fc56c67 100644
--- a/src/main/java/org/fairdatapoint/service/index/webhook/WebhookMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookMapper.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.webhook;
+package org.fairdatateam.fairdatapoint.service.index.webhook;
 
-import org.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.event.WebhookPing;
-import org.fairdatapoint.entity.index.event.WebhookTrigger;
-import org.fairdatapoint.entity.index.webhook.Webhook;
-import org.fairdatapoint.entity.index.webhook.WebhookEvent;
+import org.fairdatateam.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.event.WebhookPing;
+import org.fairdatateam.fairdatapoint.entity.index.event.WebhookTrigger;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/index/webhook/WebhookService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookService.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/service/index/webhook/WebhookService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookService.java
index 4c903220..a3efb57a 100644
--- a/src/main/java/org/fairdatapoint/service/index/webhook/WebhookService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookService.java
@@ -20,23 +20,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.webhook;
+package org.fairdatateam.fairdatapoint.service.index.webhook;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO;
-import org.fairdatapoint.database.mongo.repository.EventRepository;
-import org.fairdatapoint.database.mongo.repository.WebhookRepository;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
-import org.fairdatapoint.entity.index.webhook.Webhook;
-import org.fairdatapoint.entity.index.webhook.WebhookEvent;
-import org.fairdatapoint.service.UtilityService;
-import org.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
-import org.fairdatapoint.service.index.settings.IndexSettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.WebhookRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent;
+import org.fairdatateam.fairdatapoint.service.UtilityService;
+import org.fairdatateam.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
+import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/org/fairdatapoint/service/index/webhook/WebhookUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookUtils.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/service/index/webhook/WebhookUtils.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookUtils.java
index 56cba490..dfaec219 100644
--- a/src/main/java/org/fairdatapoint/service/index/webhook/WebhookUtils.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/index/webhook/WebhookUtils.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.webhook;
+package org.fairdatateam.fairdatapoint.service.index.webhook;
 
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.http.Exchange;
-import org.fairdatapoint.entity.index.http.ExchangeDirection;
-import org.fairdatapoint.entity.index.http.ExchangeState;
-import org.fairdatapoint.entity.index.webhook.Webhook;
-import org.fairdatapoint.entity.index.webhook.WebhookEvent;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeDirection;
+import org.fairdatateam.fairdatapoint.entity.index.http.ExchangeState;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.Webhook;
+import org.fairdatateam.fairdatapoint.entity.index.webhook.WebhookEvent;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 
diff --git a/src/main/java/org/fairdatapoint/service/jwt/JwtService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/service/jwt/JwtService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java
index c46ca774..f284bcaf 100644
--- a/src/main/java/org/fairdatapoint/service/jwt/JwtService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/jwt/JwtService.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.jwt;
+package org.fairdatateam.fairdatapoint.service.jwt;
 
 import io.jsonwebtoken.*;
 import jakarta.annotation.PostConstruct;
-import org.fairdatapoint.api.dto.auth.AuthDTO;
-import org.fairdatapoint.database.mongo.repository.UserRepository;
-import org.fairdatapoint.entity.exception.UnauthorizedException;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.service.security.MongoAuthenticationService;
+import org.fairdatateam.fairdatapoint.api.dto.auth.AuthDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
diff --git a/src/main/java/org/fairdatapoint/service/label/LabelService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/label/LabelService.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/service/label/LabelService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/label/LabelService.java
index b6fab079..0ebf63ab 100644
--- a/src/main/java/org/fairdatapoint/service/label/LabelService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/label/LabelService.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.label;
+package org.fairdatateam.fairdatapoint.service.label;
 
 import static java.util.function.Predicate.isEqual;
-import static org.fairdatapoint.config.CacheConfig.LABEL_CACHE;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.LABEL_CACHE;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 import org.fairdatateam.rdf.resolver.api.ResourceResolver;
 import org.fairdatateam.rdf.resolver.core.ContentNegotiationStrategy;
 import org.fairdatateam.rdf.resolver.core.CoreResourceResolver;
@@ -32,7 +32,7 @@
 import java.util.Optional;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.label.LabelDTO;
+import org.fairdatateam.fairdatapoint.api.dto.label.LabelDTO;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Model;
diff --git a/src/main/java/org/fairdatapoint/service/member/MemberMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java
similarity index 81%
rename from src/main/java/org/fairdatapoint/service/member/MemberMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java
index 0253e6dc..821eb368 100644
--- a/src/main/java/org/fairdatapoint/service/member/MemberMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberMapper.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.member;
+package org.fairdatateam.fairdatapoint.service.member;
 
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.entity.membership.Membership;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.service.membership.MembershipMapper;
-import org.fairdatapoint.service.user.UserMapper;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.entity.membership.Membership;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.service.membership.MembershipMapper;
+import org.fairdatateam.fairdatapoint.service.user.UserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/member/MemberService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/service/member/MemberService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java
index 1dd93750..201f75b1 100644
--- a/src/main/java/org/fairdatapoint/service/member/MemberService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/member/MemberService.java
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.member;
-
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.database.mongo.repository.MembershipRepository;
-import org.fairdatapoint.database.mongo.repository.UserRepository;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.membership.Membership;
-import org.fairdatapoint.entity.membership.MembershipPermission;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.entity.user.UserRole;
-import org.fairdatapoint.service.membership.PermissionService;
-import org.fairdatapoint.service.user.CurrentUserService;
+package org.fairdatateam.fairdatapoint.service.member;
+
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.membership.Membership;
+import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.service.membership.PermissionService;
+import org.fairdatateam.fairdatapoint.service.user.CurrentUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.fairdatateam.security.acls.dao.AclRepository;
diff --git a/src/main/java/org/fairdatapoint/service/membership/MembershipMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipMapper.java
similarity index 83%
rename from src/main/java/org/fairdatapoint/service/membership/MembershipMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipMapper.java
index 94f166dd..4cf89741 100644
--- a/src/main/java/org/fairdatapoint/service/membership/MembershipMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipMapper.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.membership;
+package org.fairdatateam.fairdatapoint.service.membership;
 
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.api.dto.membership.MembershipPermissionDTO;
-import org.fairdatapoint.entity.membership.Membership;
-import org.fairdatapoint.entity.membership.MembershipPermission;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipPermissionDTO;
+import org.fairdatateam.fairdatapoint.entity.membership.Membership;
+import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission;
 import org.springframework.stereotype.Service;
 
 import java.util.stream.Collectors;
diff --git a/src/main/java/org/fairdatapoint/service/membership/MembershipService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/membership/MembershipService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java
index bb7d19f5..26afbe3a 100644
--- a/src/main/java/org/fairdatapoint/service/membership/MembershipService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/MembershipService.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.membership;
+package org.fairdatateam.fairdatapoint.service.membership;
 
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.database.mongo.repository.MembershipRepository;
-import org.fairdatapoint.entity.membership.Membership;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MembershipRepository;
+import org.fairdatateam.fairdatapoint.entity.membership.Membership;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/membership/PermissionService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/service/membership/PermissionService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java
index 2d66773e..2efcb6ae 100644
--- a/src/main/java/org/fairdatapoint/service/membership/PermissionService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/membership/PermissionService.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.membership;
+package org.fairdatateam.fairdatapoint.service.membership;
 
-import org.fairdatapoint.entity.membership.MembershipPermission;
-import org.fairdatapoint.entity.user.UserPermission;
+import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission;
+import org.fairdatateam.fairdatapoint.entity.user.UserPermission;
 import org.springframework.security.acls.model.Permission;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
similarity index 82%
rename from src/main/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
index 44686cf9..d17ddf89 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.catalog;
+package org.fairdatateam.fairdatapoint.service.metadata.catalog;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.metadata.common.AbstractMetadataService;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +37,7 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-import static org.fairdatapoint.entity.metadata.MetadataSetter.setThemeTaxonomies;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.setThemeTaxonomies;
 
 @Service("catalogMetadataService")
 @Slf4j
diff --git a/src/main/java/org/fairdatapoint/service/metadata/common/AbstractMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java
similarity index 83%
rename from src/main/java/org/fairdatapoint/service/metadata/common/AbstractMetadataService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java
index c8dc0283..5b58e6f3 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/common/AbstractMetadataService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/AbstractMetadataService.java
@@ -20,26 +20,26 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.common;
+package org.fairdatateam.fairdatapoint.service.metadata.common;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.database.rdf.repository.common.MetadataRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataGetter;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.service.member.MemberService;
-import org.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.metadata.state.MetadataStateService;
-import org.fairdatapoint.service.metadata.validator.MetadataValidator;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
-import org.fairdatapoint.service.user.CurrentUserService;
-import org.fairdatapoint.vocabulary.FDP;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.common.MetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.service.member.MemberService;
+import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService;
+import org.fairdatateam.fairdatapoint.service.metadata.validator.MetadataValidator;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -53,10 +53,10 @@
 import java.util.stream.Collectors;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getChildren;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getParent;
-import static org.fairdatapoint.util.ThrowingFunction.suppress;
-import static org.fairdatapoint.util.ValueFactoryHelper.*;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getChildren;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getParent;
+import static org.fairdatateam.fairdatapoint.util.ThrowingFunction.suppress;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*;
 
 @Slf4j
 public abstract class AbstractMetadataService implements MetadataService {
@@ -137,7 +137,7 @@ public Model store(
     @Override
     @PreAuthorize("""
             hasPermission(#uri.stringValue(),
-            'org.fairdatapoint.entity.metadata.Metadata', 'WRITE')
+            'org.fairdatateam.fairdatapoint.entity.metadata.Metadata', 'WRITE')
             or hasRole('ADMIN')
             """)
     public Model update(
diff --git a/src/main/java/org/fairdatapoint/service/metadata/common/MetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java
similarity index 85%
rename from src/main/java/org/fairdatapoint/service/metadata/common/MetadataService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java
index a2d84530..98a3be9a 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/common/MetadataService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/common/MetadataService.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.common;
+package org.fairdatateam.fairdatapoint.service.metadata.common;
 
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 
diff --git a/src/main/java/org/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
similarity index 83%
rename from src/main/java/org/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
index 560a79b8..03afe8c9 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.enhance;
-
-import org.fairdatapoint.entity.metadata.Identifier;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import org.fairdatapoint.service.actuator.AppInfoContributor;
-import org.fairdatapoint.service.metadata.metric.MetricsMetadataService;
-import org.fairdatapoint.service.profile.ProfileService;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
-import org.fairdatapoint.util.ValueFactoryHelper;
-import org.fairdatapoint.vocabulary.DATACITE;
-import org.fairdatapoint.vocabulary.FDP;
+package org.fairdatateam.fairdatapoint.service.metadata.enhance;
+
+import org.fairdatateam.fairdatapoint.entity.metadata.Identifier;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.service.actuator.AppInfoContributor;
+import org.fairdatateam.fairdatapoint.service.metadata.metric.MetricsMetadataService;
+import org.fairdatateam.fairdatapoint.service.profile.ProfileService;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.util.ValueFactoryHelper;
+import org.fairdatateam.fairdatapoint.vocabulary.DATACITE;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.*;
@@ -46,12 +46,12 @@
 import java.util.stream.Collectors;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.*;
-import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static org.fairdatapoint.util.RdfUtil.containsObject;
-import static org.fairdatapoint.util.RdfUtil.getObjectsBy;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.*;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.*;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.containsObject;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 
 @Service
 public class MetadataEnhancer {
diff --git a/src/main/java/org/fairdatapoint/service/metadata/exception/MetadataServiceException.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/exception/MetadataServiceException.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/service/metadata/exception/MetadataServiceException.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/exception/MetadataServiceException.java
index 23725caa..62144d9c 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/exception/MetadataServiceException.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/exception/MetadataServiceException.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.service.metadata.exception;
+package org.fairdatateam.fairdatapoint.service.metadata.exception;
 
 /**
  * @author Rajaram Kaliyaperumal
diff --git a/src/main/java/org/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
index 2eda4f18..58b301d6 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.factory;
+package org.fairdatateam.fairdatapoint.service.metadata.factory;
 
-import org.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/fairdatapoint/service/metadata/generic/GenericMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java
similarity index 76%
rename from src/main/java/org/fairdatapoint/service/metadata/generic/GenericMetadataService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java
index ac827265..80467df9 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/generic/GenericMetadataService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataService.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.generic;
+package org.fairdatateam.fairdatapoint.service.metadata.generic;
 
-import org.fairdatapoint.entity.exception.ForbiddenException;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.user.UserRole;
-import org.fairdatapoint.service.metadata.common.AbstractMetadataService;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.service.metadata.common.AbstractMetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.security.acls.domain.BasePermission;
@@ -36,7 +36,7 @@
 
 import java.util.Optional;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getParent;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getParent;
 
 @Service("genericMetadataService")
 public class GenericMetadataService extends AbstractMetadataService {
diff --git a/src/main/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
index 8bde7280..d60915ee 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
@@ -25,12 +25,12 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.service.metadata.metric;
+package org.fairdatateam.fairdatapoint.service.metadata.metric;
 
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.entity.metadata.Metric;
-import org.fairdatapoint.entity.settings.Settings;
-import org.fairdatapoint.service.settings.SettingsService;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metric;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.eclipse.rdf4j.model.IRI;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +40,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 @Service
diff --git a/src/main/java/org/fairdatapoint/service/metadata/state/MetadataStateService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java
similarity index 81%
rename from src/main/java/org/fairdatapoint/service/metadata/state/MetadataStateService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java
index 9b05e46f..78018ab7 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/state/MetadataStateService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/state/MetadataStateService.java
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.state;
-
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import org.fairdatapoint.database.mongo.repository.MetadataRepository;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import org.fairdatapoint.service.metadata.validator.MetadataStateValidator;
-import org.fairdatapoint.service.user.CurrentUserService;
+package org.fairdatateam.fairdatapoint.service.metadata.state;
+
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.service.metadata.validator.MetadataStateValidator;
+import org.fairdatateam.fairdatapoint.service.user.CurrentUserService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +44,8 @@
 import java.util.stream.Collectors;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.RdfUtil.getObjectsBy;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.getObjectsBy;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class MetadataStateService {
diff --git a/src/main/java/org/fairdatapoint/service/metadata/validator/MetadataStateValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java
similarity index 82%
rename from src/main/java/org/fairdatapoint/service/metadata/validator/MetadataStateValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java
index b7b12a43..dedebddd 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/validator/MetadataStateValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataStateValidator.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.validator;
+package org.fairdatateam.fairdatapoint.service.metadata.validator;
 
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/src/main/java/org/fairdatapoint/service/metadata/validator/MetadataValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java
similarity index 80%
rename from src/main/java/org/fairdatapoint/service/metadata/validator/MetadataValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java
index 31c81e14..516b65a6 100644
--- a/src/main/java/org/fairdatapoint/service/metadata/validator/MetadataValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/metadata/validator/MetadataValidator.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.validator;
+package org.fairdatateam.fairdatapoint.service.metadata.validator;
 
-import org.fairdatapoint.database.rdf.repository.common.MetadataRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.rdf.ShaclValidator;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
-import org.fairdatapoint.service.schema.MetadataSchemaService;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.common.MetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.rdf.ShaclValidator;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
@@ -38,8 +38,8 @@
 import org.springframework.stereotype.Service;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getParent;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getParent;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class MetadataValidator {
diff --git a/src/main/java/org/fairdatapoint/service/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java
similarity index 98%
rename from src/main/java/org/fairdatapoint/service/openapi/OpenApiGenerator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java
index 582162e3..7904de31 100644
--- a/src/main/java/org/fairdatapoint/service/openapi/OpenApiGenerator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiGenerator.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.openapi;
+package org.fairdatateam.fairdatapoint.service.openapi;
 
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
@@ -34,12 +34,12 @@
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.oas.models.responses.ApiResponses;
 import io.swagger.v3.oas.models.tags.Tag;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.member.MemberCreateDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.api.dto.metadata.MetaDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.StringUtils;
 
diff --git a/src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java
similarity index 95%
rename from src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java
index 2952d120..117e7854 100644
--- a/src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiService.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.openapi;
+package org.fairdatateam.fairdatapoint.service.openapi;
 
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.Paths;
 import jakarta.annotation.PostConstruct;
 import lombok.extern.log4j.Log4j2;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/openapi/OpenApiTagsUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/service/openapi/OpenApiTagsUtils.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java
index 6707a10f..d49f62fb 100644
--- a/src/main/java/org/fairdatapoint/service/openapi/OpenApiTagsUtils.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/openapi/OpenApiTagsUtils.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.openapi;
+package org.fairdatateam.fairdatapoint.service.openapi;
 
 import io.swagger.v3.oas.models.tags.Tag;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/main/java/org/fairdatapoint/service/ping/PingService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/service/ping/PingService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java
index bf1d9411..e99a088f 100644
--- a/src/main/java/org/fairdatapoint/service/ping/PingService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.ping;
+package org.fairdatateam.fairdatapoint.service.ping;
 
 import lombok.extern.log4j.Log4j2;
-import org.fairdatapoint.config.properties.InstanceProperties;
-import org.fairdatapoint.config.properties.PingProperties;
-import org.fairdatapoint.entity.settings.Settings;
-import org.fairdatapoint.service.settings.SettingsService;
+import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatateam.fairdatapoint.config.properties.PingProperties;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Async;
diff --git a/src/main/java/org/fairdatapoint/service/profile/ProfileService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/service/profile/ProfileService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java
index 6556dc97..412831f4 100644
--- a/src/main/java/org/fairdatapoint/service/profile/ProfileService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/profile/ProfileService.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.profile;
+package org.fairdatateam.fairdatapoint.service.profile;
 
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
@@ -42,7 +42,7 @@
 import java.util.Optional;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.ValueFactoryHelper.*;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*;
 
 @Service
 public class ProfileService {
diff --git a/src/main/java/org/fairdatapoint/service/rdf/ShaclValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/rdf/ShaclValidator.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/service/rdf/ShaclValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/rdf/ShaclValidator.java
index 80d1678d..e508e09c 100644
--- a/src/main/java/org/fairdatapoint/service/rdf/ShaclValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/rdf/ShaclValidator.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.rdf;
+package org.fairdatateam.fairdatapoint.service.rdf;
 
-import org.fairdatapoint.entity.exception.RdfValidationException;
-import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.exception.RdfValidationException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.RDF4J;
 import org.eclipse.rdf4j.repository.RepositoryException;
@@ -36,7 +36,7 @@
 
 import java.util.ArrayList;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class ShaclValidator {
diff --git a/src/main/java/org/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/service/reset/FactoryDefaults.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java
index 525a33b1..0100032e 100644
--- a/src/main/java/org/fairdatapoint/service/reset/FactoryDefaults.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/FactoryDefaults.java
@@ -20,26 +20,25 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.reset;
+package org.fairdatateam.fairdatapoint.service.reset;
 
-import org.fairdatapoint.entity.membership.Membership;
-import org.fairdatapoint.entity.membership.MembershipPermission;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
-import org.fairdatapoint.entity.resource.*;
-import org.fairdatapoint.entity.resource.*;
-import org.fairdatapoint.entity.resource.*;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.entity.schema.MetadataSchemaType;
-import org.fairdatapoint.entity.schema.SemVer;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.entity.user.UserRole;
-import org.fairdatapoint.service.schema.MetadataSchemaShaclUtils;
-import org.fairdatapoint.util.KnownUUIDs;
-import org.fairdatapoint.vocabulary.DATACITE;
-import org.fairdatapoint.vocabulary.DCAT3;
-import org.fairdatapoint.vocabulary.FDP;
-import org.fairdatapoint.vocabulary.R3D;
+import org.fairdatateam.fairdatapoint.entity.membership.Membership;
+import org.fairdatateam.fairdatapoint.entity.membership.MembershipPermission;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.resource.*;
+import org.fairdatateam.fairdatapoint.entity.resource.*;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType;
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaShaclUtils;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.vocabulary.DATACITE;
+import org.fairdatateam.fairdatapoint.vocabulary.DCAT3;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
+import org.fairdatateam.fairdatapoint.vocabulary.R3D;
 import org.bson.BasicBSONObject;
 import org.bson.Document;
 import org.bson.types.BasicBSONList;
@@ -52,8 +51,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.fairdatapoint.util.ResourceReader.loadClassResource;
-import static org.fairdatapoint.util.ValueFactoryHelper.*;
+import static org.fairdatateam.fairdatapoint.util.ResourceReader.loadClassResource;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.*;
 
 public class FactoryDefaults {
 
@@ -405,7 +404,7 @@ public static Document aclRepository(String persistentUrl) {
                 .append("name", USER_ALBERT.getUuid())
                 .append("isPrincipal", true);
         final Document acl = new Document();
-        acl.append("className", "org.fairdatapoint.entity.metadata.FDPMetadata");
+        acl.append("className", "org.fairdatateam.fairdatapoint.entity.metadata.FDPMetadata");
         acl.append("instanceId", persistentUrl);
         acl.append("owner", owner);
         acl.append("inheritPermissions", true);
diff --git a/src/main/java/org/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java
similarity index 90%
rename from src/main/java/org/fairdatapoint/service/reset/ResetService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java
index d866e773..0c39b899 100644
--- a/src/main/java/org/fairdatapoint/service/reset/ResetService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/reset/ResetService.java
@@ -20,20 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.reset;
+package org.fairdatateam.fairdatapoint.service.reset;
 
 import com.mongodb.client.MongoCollection;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.reset.ResetDTO;
-import org.fairdatapoint.database.mongo.repository.*;
-import org.fairdatapoint.database.mongo.repository.*;
-import org.fairdatapoint.database.mongo.repository.*;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.metadata.generic.GenericMetadataService;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import org.fairdatapoint.service.settings.SettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.reset.ResetDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.*;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.*;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.metadata.generic.GenericMetadataService;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
 import org.bson.Document;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Statement;
@@ -52,7 +51,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 @Service
diff --git a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionCache.java b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCache.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionCache.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCache.java
index 4f9a501c..1d8c611d 100644
--- a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionCache.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCache.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.resource;
+package org.fairdatateam.fairdatapoint.service.resource;
 
 import jakarta.annotation.PostConstruct;
 import lombok.Getter;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
@@ -36,8 +36,8 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_CACHE;
-import static org.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_PARENT_CACHE;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_CACHE;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_PARENT_CACHE;
 
 @Service
 public class ResourceDefinitionCache {
diff --git a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionMapper.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionMapper.java
index 7a071306..92dfb6bd 100644
--- a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionMapper.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.resource;
+package org.fairdatateam.fairdatapoint.service.resource;
 
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionService.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionService.java
index 96c15a5f..5f10facd 100644
--- a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionService.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.resource;
-
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.membership.MembershipService;
-import org.fairdatapoint.service.openapi.OpenApiService;
+package org.fairdatateam.fairdatapoint.service.resource;
+
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.membership.MembershipService;
+import org.fairdatateam.fairdatapoint.service.openapi.OpenApiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
index ec73fdba..bc3c623d 100644
--- a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.resource;
+package org.fairdatateam.fairdatapoint.service.resource;
 
 import jakarta.annotation.PostConstruct;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
@@ -34,7 +34,7 @@
 
 import java.util.*;
 
-import static org.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_TARGET_CLASSES_CACHE;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_TARGET_CLASSES_CACHE;
 
 @Service
 public class ResourceDefinitionTargetClassesCache {
diff --git a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidator.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidator.java
index 5f9c6b61..a9f6d925 100644
--- a/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidator.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.resource;
+package org.fairdatateam.fairdatapoint.service.resource;
 
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.BindException;
@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import static org.fairdatapoint.util.ValidationUtil.uniquenessValidationFailed;
+import static org.fairdatateam.fairdatapoint.util.ValidationUtil.uniquenessValidationFailed;
 
 @Service
 public class ResourceDefinitionValidator {
diff --git a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaMapper.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/service/schema/MetadataSchemaMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaMapper.java
index 53e9b664..8f1264ed 100644
--- a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaMapper.java
@@ -20,13 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.schema;
+package org.fairdatateam.fairdatapoint.service.schema;
 
-import org.fairdatapoint.api.dto.schema.*;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
-import org.fairdatapoint.entity.schema.MetadataSchemaType;
-import org.fairdatapoint.entity.schema.SemVer;
+import org.fairdatateam.fairdatapoint.api.dto.schema.*;
+import org.fairdatateam.fairdatapoint.api.dto.schema.*;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType;
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
diff --git a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
similarity index 94%
rename from src/main/java/org/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
index 54707071..97eea316 100644
--- a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.schema;
+package org.fairdatateam.fairdatapoint.service.schema;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import org.fairdatapoint.entity.exception.MetadataSchemaImportException;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.MetadataSchemaImportException;
 import org.springframework.http.HttpHeaders;
 
 import java.io.IOException;
diff --git a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/service/schema/MetadataSchemaService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java
index 189a483f..437a2a5d 100644
--- a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaService.java
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.schema;
+package org.fairdatateam.fairdatapoint.service.schema;
 
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.schema.*;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
-import org.fairdatapoint.entity.schema.MetadataSchemaType;
-import org.fairdatapoint.entity.schema.SemVer;
-import org.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import org.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.api.dto.schema.*;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaType;
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
index cc75332a..96383618 100644
--- a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.schema;
+package org.fairdatateam.fairdatapoint.service.schema;
 
-import org.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
@@ -32,7 +32,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 public class MetadataSchemaShaclUtils {
 
diff --git a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java
similarity index 86%
rename from src/main/java/org/fairdatapoint/service/schema/MetadataSchemaValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java
index 0b8d4815..3743d03a 100644
--- a/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/schema/MetadataSchemaValidator.java
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.schema;
-
-import org.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.util.RdfIOUtil;
+package org.fairdatateam.fairdatapoint.service.schema;
+
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/org/fairdatapoint/service/search/SearchFilterCache.java b/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchFilterCache.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/search/SearchFilterCache.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchFilterCache.java
index 03eee51d..adc29f4f 100644
--- a/src/main/java/org/fairdatapoint/service/search/SearchFilterCache.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchFilterCache.java
@@ -20,20 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.search;
+package org.fairdatateam.fairdatapoint.service.search;
 
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.entity.search.SearchFilterCacheContainer;
-import org.fairdatapoint.service.label.LabelService;
-import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterCacheContainer;
+import org.fairdatateam.fairdatapoint.service.label.LabelService;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Component;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.config.CacheConfig.SEARCH_FILTERS_CACHE;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.SEARCH_FILTERS_CACHE;
 
 @Component
 @Slf4j
diff --git a/src/main/java/org/fairdatapoint/service/search/SearchMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchMapper.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/service/search/SearchMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchMapper.java
index 6b5b8768..13577e50 100644
--- a/src/main/java/org/fairdatapoint/service/search/SearchMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchMapper.java
@@ -20,13 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.search;
+package org.fairdatateam.fairdatapoint.service.search;
 
-import org.fairdatapoint.api.dto.search.*;
-import org.fairdatapoint.entity.search.SearchFilterValue;
-import org.fairdatapoint.entity.search.SearchResult;
-import org.fairdatapoint.entity.settings.SettingsSearchFilter;
-import org.fairdatapoint.entity.settings.SettingsSearchFilterItem;
+import org.fairdatateam.fairdatapoint.api.dto.search.*;
+import org.fairdatateam.fairdatapoint.api.dto.search.*;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterValue;
+import org.fairdatateam.fairdatapoint.entity.search.SearchResult;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilterItem;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/src/main/java/org/fairdatapoint/service/search/SearchService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchService.java
similarity index 86%
rename from src/main/java/org/fairdatapoint/service/search/SearchService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchService.java
index 052a7496..ae20b9ec 100644
--- a/src/main/java/org/fairdatapoint/service/search/SearchService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/search/SearchService.java
@@ -20,22 +20,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.search;
+package org.fairdatateam.fairdatapoint.service.search;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
-import org.fairdatapoint.api.dto.search.*;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.metadata.MetadataState;
-import org.fairdatapoint.entity.search.SearchFilterCacheContainer;
-import org.fairdatapoint.entity.search.SearchFilterType;
-import org.fairdatapoint.entity.search.SearchFilterValue;
-import org.fairdatapoint.entity.search.SearchResult;
-import org.fairdatapoint.entity.settings.SettingsSearchFilter;
-import org.fairdatapoint.service.metadata.state.MetadataStateService;
-import org.fairdatapoint.service.settings.SettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.search.*;
+import org.fairdatateam.fairdatapoint.api.dto.search.*;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterCacheContainer;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterType;
+import org.fairdatateam.fairdatapoint.entity.search.SearchFilterValue;
+import org.fairdatateam.fairdatapoint.entity.search.SearchResult;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter;
+import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
 import org.apache.commons.lang.text.StrSubstitutor;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.query.MalformedQueryException;
@@ -52,8 +53,8 @@
 
 import static java.lang.String.format;
 import static java.util.stream.Collectors.toList;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 
 @Service
 public class SearchService {
diff --git a/src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
index 2000b1f4..c23e149f 100644
--- a/src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.search.query;
+package org.fairdatateam.fairdatapoint.service.search.query;
 
-import org.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery;
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
diff --git a/src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java
index 8245ce55..6cb704ed 100644
--- a/src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/search/query/SearchSavedQueryService.java
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.search.query;
-
-import org.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
-import org.fairdatapoint.entity.exception.ForbiddenException;
-import org.fairdatapoint.entity.search.SearchSavedQuery;
-import org.fairdatapoint.entity.search.SearchSavedQueryType;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.entity.user.UserRole;
-import org.fairdatapoint.service.user.CurrentUserService;
-import org.fairdatapoint.service.user.UserService;
+package org.fairdatateam.fairdatapoint.service.search.query;
+
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
+import org.fairdatateam.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatateam.fairdatapoint.service.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/security/MongoAuthenticationService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoAuthenticationService.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/service/security/MongoAuthenticationService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoAuthenticationService.java
index 10ac90e6..1dd112a4 100644
--- a/src/main/java/org/fairdatapoint/service/security/MongoAuthenticationService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoAuthenticationService.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.security;
+package org.fairdatateam.fairdatapoint.service.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/main/java/org/fairdatapoint/service/security/MongoUserDetailsService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java
similarity index 89%
rename from src/main/java/org/fairdatapoint/service/security/MongoUserDetailsService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java
index cbad4808..5ed58ce7 100644
--- a/src/main/java/org/fairdatapoint/service/security/MongoUserDetailsService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/security/MongoUserDetailsService.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.security;
+package org.fairdatateam.fairdatapoint.service.security;
 
-import org.fairdatapoint.database.mongo.repository.UserRepository;
-import org.fairdatapoint.entity.exception.UnauthorizedException;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.UnauthorizedException;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
diff --git a/src/main/java/org/fairdatapoint/service/settings/SettingsCache.java b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsCache.java
similarity index 88%
rename from src/main/java/org/fairdatapoint/service/settings/SettingsCache.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsCache.java
index e573a512..320ea735 100644
--- a/src/main/java/org/fairdatapoint/service/settings/SettingsCache.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsCache.java
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.settings;
+package org.fairdatateam.fairdatapoint.service.settings;
 
 import jakarta.annotation.PostConstruct;
-import org.fairdatapoint.database.mongo.repository.SettingsRepository;
-import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Service;
 
-import static org.fairdatapoint.config.CacheConfig.SETTINGS_CACHE;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.SETTINGS_CACHE;
 
 @Service
 public class SettingsCache {
diff --git a/src/main/java/org/fairdatapoint/service/settings/SettingsMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/service/settings/SettingsMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java
index ca2f9163..991a8913 100644
--- a/src/main/java/org/fairdatapoint/service/settings/SettingsMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsMapper.java
@@ -20,16 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.settings;
-
-import org.fairdatapoint.api.dto.search.SearchFilterDTO;
-import org.fairdatapoint.api.dto.search.SearchFilterItemDTO;
-import org.fairdatapoint.api.dto.settings.*;
-import org.fairdatapoint.entity.settings.*;
-import org.fairdatapoint.config.properties.InstanceProperties;
-import org.fairdatapoint.config.properties.PingProperties;
-import org.fairdatapoint.config.properties.RepositoryProperties;
-import org.fairdatapoint.service.search.SearchMapper;
+package org.fairdatateam.fairdatapoint.service.settings;
+
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterItemDTO;
+import org.fairdatateam.fairdatapoint.api.dto.settings.*;
+import org.fairdatateam.fairdatapoint.entity.settings.*;
+import org.fairdatateam.fairdatapoint.api.dto.settings.*;
+import org.fairdatateam.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatateam.fairdatapoint.config.properties.PingProperties;
+import org.fairdatateam.fairdatapoint.config.properties.RepositoryProperties;
+import org.fairdatateam.fairdatapoint.entity.settings.*;
+import org.fairdatateam.fairdatapoint.service.search.SearchMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/org/fairdatapoint/service/settings/SettingsService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java
similarity index 86%
rename from src/main/java/org/fairdatapoint/service/settings/SettingsService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java
index fbf84dc5..042be7af 100644
--- a/src/main/java/org/fairdatapoint/service/settings/SettingsService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/settings/SettingsService.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.settings;
+package org.fairdatateam.fairdatapoint.service.settings;
 
-import org.fairdatapoint.api.dto.settings.SettingsDTO;
-import org.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
-import org.fairdatapoint.database.mongo.repository.SettingsRepository;
-import org.fairdatapoint.entity.settings.Settings;
-import org.fairdatapoint.entity.settings.SettingsSearchFilter;
-import org.fairdatapoint.service.search.SearchFilterCache;
+import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsDTO;
+import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsSearchFilter;
+import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/service/user/CurrentUserService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/user/CurrentUserService.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/service/user/CurrentUserService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/user/CurrentUserService.java
index 8d1f21c5..45833f22 100644
--- a/src/main/java/org/fairdatapoint/service/user/CurrentUserService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/user/CurrentUserService.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.user;
+package org.fairdatateam.fairdatapoint.service.user;
 
-import org.fairdatapoint.database.mongo.repository.UserRepository;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
diff --git a/src/main/java/org/fairdatapoint/service/user/UserMapper.java b/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserMapper.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/service/user/UserMapper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/user/UserMapper.java
index 780a0b59..d326eff5 100644
--- a/src/main/java/org/fairdatapoint/service/user/UserMapper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserMapper.java
@@ -20,10 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.user;
+package org.fairdatateam.fairdatapoint.service.user;
 
-import org.fairdatapoint.api.dto.user.*;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.api.dto.user.*;
+import org.fairdatateam.fairdatapoint.api.dto.user.*;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/fairdatapoint/service/user/UserService.java b/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserService.java
similarity index 93%
rename from src/main/java/org/fairdatapoint/service/user/UserService.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/user/UserService.java
index 627df8d3..35cc6e43 100644
--- a/src/main/java/org/fairdatapoint/service/user/UserService.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserService.java
@@ -20,12 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.user;
+package org.fairdatateam.fairdatapoint.service.user;
 
-import org.fairdatapoint.api.dto.user.*;
-import org.fairdatapoint.database.mongo.repository.UserRepository;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.service.member.MemberService;
+import org.fairdatateam.fairdatapoint.api.dto.user.*;
+import org.fairdatateam.fairdatapoint.api.dto.user.*;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.service.member.MemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/src/main/java/org/fairdatapoint/service/user/UserValidator.java b/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserValidator.java
similarity index 87%
rename from src/main/java/org/fairdatapoint/service/user/UserValidator.java
rename to src/main/java/org/fairdatateam/fairdatapoint/service/user/UserValidator.java
index abd35b23..651da8ca 100644
--- a/src/main/java/org/fairdatapoint/service/user/UserValidator.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/service/user/UserValidator.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.user;
+package org.fairdatateam.fairdatapoint.service.user;
 
-import org.fairdatapoint.database.mongo.repository.UserRepository;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.UserRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/fairdatapoint/util/HttpUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java
similarity index 96%
rename from src/main/java/org/fairdatapoint/util/HttpUtil.java
rename to src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java
index cc74cd9a..e48a784c 100644
--- a/src/main/java/org/fairdatapoint/util/HttpUtil.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/util/HttpUtil.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.util;
+package org.fairdatateam.fairdatapoint.util;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.springframework.http.HttpHeaders;
@@ -36,7 +36,7 @@
 import static java.lang.String.format;
 import static java.util.Optional.of;
 import static java.util.Optional.ofNullable;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 public class HttpUtil {
diff --git a/src/main/java/org/fairdatapoint/util/KnownUUIDs.java b/src/main/java/org/fairdatateam/fairdatapoint/util/KnownUUIDs.java
similarity index 98%
rename from src/main/java/org/fairdatapoint/util/KnownUUIDs.java
rename to src/main/java/org/fairdatateam/fairdatapoint/util/KnownUUIDs.java
index 7b13a83e..ccec4396 100644
--- a/src/main/java/org/fairdatapoint/util/KnownUUIDs.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/util/KnownUUIDs.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.util;
+package org.fairdatateam.fairdatapoint.util;
 
 public class KnownUUIDs {
 
diff --git a/src/main/java/org/fairdatapoint/util/RdfIOUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java
similarity index 91%
rename from src/main/java/org/fairdatapoint/util/RdfIOUtil.java
rename to src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java
index c11dc017..8eae2649 100644
--- a/src/main/java/org/fairdatapoint/util/RdfIOUtil.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/util/RdfIOUtil.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.util;
+package org.fairdatateam.fairdatapoint.util;
 
-import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
@@ -44,11 +44,11 @@
 import java.util.List;
 import java.util.Objects;
 
-import static org.fairdatapoint.entity.metadata.MetadataSetter.setRdfTypes;
-import static org.fairdatapoint.util.RdfUtil.getSubjectBy;
-import static org.fairdatapoint.util.ResourceReader.getResource;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.s;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataSetter.setRdfTypes;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.getSubjectBy;
+import static org.fairdatateam.fairdatapoint.util.ResourceReader.getResource;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.s;
 
 public class RdfIOUtil {
 
diff --git a/src/main/java/org/fairdatapoint/util/RdfUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/util/RdfUtil.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/util/RdfUtil.java
rename to src/main/java/org/fairdatateam/fairdatapoint/util/RdfUtil.java
index 9bc9b34a..7deb434b 100644
--- a/src/main/java/org/fairdatapoint/util/RdfUtil.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/util/RdfUtil.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.util;
+package org.fairdatateam.fairdatapoint.util;
 
 import org.eclipse.rdf4j.model.*;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 public class RdfUtil {
 
diff --git a/src/main/java/org/fairdatapoint/util/ResourceReader.java b/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java
similarity index 98%
rename from src/main/java/org/fairdatapoint/util/ResourceReader.java
rename to src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java
index 2aec2b01..b917fb1a 100644
--- a/src/main/java/org/fairdatapoint/util/ResourceReader.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/util/ResourceReader.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.util;
+package org.fairdatateam.fairdatapoint.util;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
diff --git a/src/main/java/org/fairdatapoint/util/ThrowingFunction.java b/src/main/java/org/fairdatateam/fairdatapoint/util/ThrowingFunction.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/util/ThrowingFunction.java
rename to src/main/java/org/fairdatateam/fairdatapoint/util/ThrowingFunction.java
index a261628a..2ffff11b 100644
--- a/src/main/java/org/fairdatapoint/util/ThrowingFunction.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/util/ThrowingFunction.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.util;
+package org.fairdatateam.fairdatapoint.util;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/org/fairdatapoint/util/ValidationUtil.java b/src/main/java/org/fairdatateam/fairdatapoint/util/ValidationUtil.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/util/ValidationUtil.java
rename to src/main/java/org/fairdatateam/fairdatapoint/util/ValidationUtil.java
index 64c26d0d..50913a98 100644
--- a/src/main/java/org/fairdatapoint/util/ValidationUtil.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/util/ValidationUtil.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.util;
+package org.fairdatateam.fairdatapoint.util;
 
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindException;
diff --git a/src/main/java/org/fairdatapoint/util/ValueFactoryHelper.java b/src/main/java/org/fairdatateam/fairdatapoint/util/ValueFactoryHelper.java
similarity index 98%
rename from src/main/java/org/fairdatapoint/util/ValueFactoryHelper.java
rename to src/main/java/org/fairdatateam/fairdatapoint/util/ValueFactoryHelper.java
index 127f2b8f..407a5629 100644
--- a/src/main/java/org/fairdatapoint/util/ValueFactoryHelper.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/util/ValueFactoryHelper.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.util;
+package org.fairdatateam.fairdatapoint.util;
 
 import org.eclipse.rdf4j.model.*;
 import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
diff --git a/src/main/java/org/fairdatapoint/vocabulary/DCAT3.java b/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DCAT3.java
similarity index 92%
rename from src/main/java/org/fairdatapoint/vocabulary/DCAT3.java
rename to src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DCAT3.java
index 970370f3..b2a92034 100644
--- a/src/main/java/org/fairdatapoint/vocabulary/DCAT3.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/DCAT3.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.vocabulary;
+package org.fairdatateam.fairdatapoint.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.vocabulary.DCAT;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 /**
  * Temporary solution for DCAT3 which currently not supported in RDR4J vocabularies
diff --git a/src/main/java/org/fairdatapoint/vocabulary/Sio.java b/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/Sio.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/vocabulary/Sio.java
rename to src/main/java/org/fairdatateam/fairdatapoint/vocabulary/Sio.java
index 479b4b53..4cae29a3 100644
--- a/src/main/java/org/fairdatapoint/vocabulary/Sio.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/Sio.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.vocabulary;
+package org.fairdatateam.fairdatapoint.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.ValueFactory;
diff --git a/src/main/java/org/fairdatapoint/vocabulary/WebAccessControl.java b/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/WebAccessControl.java
similarity index 97%
rename from src/main/java/org/fairdatapoint/vocabulary/WebAccessControl.java
rename to src/main/java/org/fairdatateam/fairdatapoint/vocabulary/WebAccessControl.java
index 7840a09f..91ae215d 100644
--- a/src/main/java/org/fairdatapoint/vocabulary/WebAccessControl.java
+++ b/src/main/java/org/fairdatateam/fairdatapoint/vocabulary/WebAccessControl.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.vocabulary;
+package org.fairdatateam.fairdatapoint.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.ValueFactory;
diff --git a/src/test/java/org/fairdatapoint/BaseIntegrationTest.java b/src/test/java/org/fairdatateam/fairdatapoint/BaseIntegrationTest.java
similarity index 97%
rename from src/test/java/org/fairdatapoint/BaseIntegrationTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/BaseIntegrationTest.java
index 4c9afb6f..b8dff3cd 100644
--- a/src/test/java/org/fairdatapoint/BaseIntegrationTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/BaseIntegrationTest.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint;
+package org.fairdatateam.fairdatapoint;
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/org/fairdatapoint/WebIntegrationTest.java b/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/WebIntegrationTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java
index b9025895..a652a30c 100644
--- a/src/test/java/org/fairdatapoint/WebIntegrationTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/WebIntegrationTest.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint;
+package org.fairdatateam.fairdatapoint;
 
-import org.fairdatapoint.database.mongo.migration.development.MigrationRunner;
-import org.fairdatapoint.database.rdf.migration.development.RdfDevelopmentMigrationRunner;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.MigrationRunner;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.RdfDevelopmentMigrationRunner;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
similarity index 96%
rename from src/test/java/org/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
index f37015f8..570ac17e 100644
--- a/src/test/java/org/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.actuator;
+package org.fairdatateam.fairdatapoint.acceptance.actuator;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/test/java/org/fairdatapoint/acceptance/actuator/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/actuator/List_Info_GET.java
similarity index 96%
rename from src/test/java/org/fairdatapoint/acceptance/actuator/List_Info_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/actuator/List_Info_GET.java
index 9694314a..3d08b23f 100644
--- a/src/test/java/org/fairdatapoint/acceptance/actuator/List_Info_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/actuator/List_Info_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.actuator;
+package org.fairdatateam.fairdatapoint.acceptance.actuator;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/apikey/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java
similarity index 84%
rename from src/test/java/org/fairdatapoint/acceptance/apikey/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java
index c5c10d50..ed22680f 100644
--- a/src/test/java/org/fairdatapoint/acceptance/apikey/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/Detail_DELETE.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.apikey;
+package org.fairdatateam.fairdatapoint.acceptance.apikey;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures;
-import org.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures;
+import org.fairdatateam.fairdatapoint.entity.apikey.ApiKey;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +37,9 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/apikey/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/apikey/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java
index 32cce339..d5c0bd47 100644
--- a/src/test/java/org/fairdatapoint/acceptance/apikey/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_GET.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.apikey;
+package org.fairdatateam.fairdatapoint.acceptance.apikey;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import org.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +37,7 @@
 import java.net.URI;
 import java.util.List;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/apikey/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_POST.java
similarity index 89%
rename from src/test/java/org/fairdatapoint/acceptance/apikey/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_POST.java
index 147654e3..a4ce7faa 100644
--- a/src/test/java/org/fairdatapoint/acceptance/apikey/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/apikey/List_POST.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.apikey;
+package org.fairdatateam.fairdatapoint.acceptance.apikey;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -31,7 +31,7 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/common/ForbiddenTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/common/ForbiddenTest.java
similarity index 96%
rename from src/test/java/org/fairdatapoint/acceptance/common/ForbiddenTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/common/ForbiddenTest.java
index 6691113c..be990376 100644
--- a/src/test/java/org/fairdatapoint/acceptance/common/ForbiddenTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/common/ForbiddenTest.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.common;
+package org.fairdatateam.fairdatapoint.acceptance.common;
 
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.core.ParameterizedTypeReference;
@@ -31,7 +31,7 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
+import static org.fairdatateam.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/common/NotFoundTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/common/NotFoundTest.java
similarity index 95%
rename from src/test/java/org/fairdatapoint/acceptance/common/NotFoundTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/common/NotFoundTest.java
index ac633a4d..434fdc95 100644
--- a/src/test/java/org/fairdatapoint/acceptance/common/NotFoundTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/common/NotFoundTest.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.common;
+package org.fairdatateam.fairdatapoint.acceptance.common;
 
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.core.ParameterizedTypeReference;
@@ -31,8 +31,8 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.WebIntegrationTest.ADMIN_TOKEN;
-import static org.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
+import static org.fairdatateam.fairdatapoint.WebIntegrationTest.ADMIN_TOKEN;
+import static org.fairdatateam.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/config/List_Bootstrap_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
index 2825cb02..50aa74ba 100644
--- a/src/test/java/org/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.config;
+package org.fairdatateam.fairdatapoint.acceptance.config;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.config.BootstrapConfigDTO;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpStatus;
diff --git a/src/test/java/org/fairdatapoint/acceptance/dashboard/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/dashboard/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java
index a520bf0b..fc0f703a 100644
--- a/src/test/java/org/fairdatapoint/acceptance/dashboard/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/dashboard/List_GET.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.dashboard;
+package org.fairdatateam.fairdatapoint.acceptance.dashboard;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.service.member.MemberService;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.service.member.MemberService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -40,7 +40,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/general/ContentNegotiationTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/ContentNegotiationTest.java
similarity index 96%
rename from src/test/java/org/fairdatapoint/acceptance/general/ContentNegotiationTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/ContentNegotiationTest.java
index c0899e48..0f819993 100644
--- a/src/test/java/org/fairdatapoint/acceptance/general/ContentNegotiationTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/ContentNegotiationTest.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.general;
+package org.fairdatateam.fairdatapoint.acceptance.general;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.apache.http.HttpHeaders;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/general/SecurityTest.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java
similarity index 92%
rename from src/test/java/org/fairdatapoint/acceptance/general/SecurityTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java
index 9b74e728..e556ef3c 100644
--- a/src/test/java/org/fairdatapoint/acceptance/general/SecurityTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/general/SecurityTest.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.general;
+package org.fairdatateam.fairdatapoint.acceptance.general;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures;
-import org.fairdatapoint.util.RdfIOUtil;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.apikey.data.ApiKeyFixtures;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
index 013626d7..9fe95886 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.admin;
+package org.fairdatateam.fairdatapoint.acceptance.index.admin;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.repository.EventRepository;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.event.EventType;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.event.EventType;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
index 693ee920..82c422ed 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.admin;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.database.mongo.repository.EventRepository;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.entity.index.event.EventType;
-import org.fairdatapoint.utils.TestIndexEntryFixtures;
+package org.fairdatateam.fairdatapoint.acceptance.index.admin;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.EventRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.entity.index.event.EventType;
+import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java
similarity index 92%
rename from src/test/java/org/fairdatapoint/acceptance/index/entry/List_All_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java
index 47676343..28180a06 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/entry/List_All_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_All_GET.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.entry;
+package org.fairdatateam.fairdatapoint.acceptance.index.entry;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.utils.TestIndexEntryFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java
similarity index 95%
rename from src/test/java/org/fairdatapoint/acceptance/index/entry/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java
index 9aaae6d1..c75cb424 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/entry/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_GET.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.entry;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.utils.CustomPageImpl;
-import org.fairdatapoint.utils.TestIndexEntryFixtures;
+package org.fairdatateam.fairdatapoint.acceptance.index.entry;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.utils.CustomPageImpl;
+import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/acceptance/index/entry/List_Info_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java
index a256e908..07ba4328 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/entry/List_Info_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/entry/List_Info_GET.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.entry;
+package org.fairdatateam.fairdatapoint.acceptance.index.entry;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/acceptance/index/ping/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java
index a7f751d0..f729e11a 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/ping/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/ping/List_POST.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.ping;
+package org.fairdatateam.fairdatapoint.acceptance.index.ping;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.database.mongo.repository.IndexEntryRepository;
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.utils.TestIndexEntryFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexEntryRepository;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.utils.TestIndexEntryFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/settings/List_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/index/settings/List_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java
index 78df0797..af358859 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/settings/List_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_DELETE.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.settings;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import org.fairdatapoint.database.mongo.repository.IndexSettingsRepository;
-import org.fairdatapoint.entity.index.settings.IndexSettings;
-import org.fairdatapoint.entity.index.settings.IndexSettingsPing;
-import org.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
+package org.fairdatateam.fairdatapoint.acceptance.index.settings;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/settings/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/index/settings/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java
index 68a021c5..7d757d37 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/settings/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_GET.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.settings;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import org.fairdatapoint.database.mongo.repository.IndexSettingsRepository;
-import org.fairdatapoint.entity.index.settings.IndexSettings;
-import org.fairdatapoint.entity.index.settings.IndexSettingsPing;
-import org.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
+package org.fairdatateam.fairdatapoint.acceptance.index.settings;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/index/settings/List_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/index/settings/List_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java
index 471958e3..c202bec2 100644
--- a/src/test/java/org/fairdatapoint/acceptance/index/settings/List_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/index/settings/List_PUT.java
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.index.settings;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsPingDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsRetrievalDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import org.fairdatapoint.database.mongo.repository.IndexSettingsRepository;
-import org.fairdatapoint.entity.index.settings.IndexSettings;
-import org.fairdatapoint.entity.index.settings.IndexSettingsPing;
-import org.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
+package org.fairdatateam.fairdatapoint.acceptance.index.settings;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsPingDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsRetrievalDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.IndexSettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsPing;
+import org.fairdatateam.fairdatapoint.entity.index.settings.IndexSettingsRetrieval;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/membership/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/Common.java
similarity index 90%
rename from src/test/java/org/fairdatapoint/acceptance/membership/Common.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/Common.java
index ea0cfb52..6624f9a5 100644
--- a/src/test/java/org/fairdatapoint/acceptance/membership/Common.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/Common.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.membership;
+package org.fairdatateam.fairdatapoint.acceptance.membership;
 
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.entity.membership.Membership;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
diff --git a/src/test/java/org/fairdatapoint/acceptance/membership/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/membership/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java
index 64f9bc63..99d3d6e3 100644
--- a/src/test/java/org/fairdatapoint/acceptance/membership/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/membership/List_GET.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.membership;
+package org.fairdatateam.fairdatapoint.acceptance.membership;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
@@ -36,7 +36,7 @@
 import java.net.URI;
 import java.util.List;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java
similarity index 88%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/Common.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java
index 22faf466..289b5012 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/Common.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/Common.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata;
+package org.fairdatateam.fairdatapoint.acceptance.metadata;
 
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
@@ -36,7 +36,7 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
+import static org.fairdatateam.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.Is.is;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
index f1c37460..cc6a3f30 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
index 1c8fab74..74a235d4 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
index 916e9d72..3b4fb5f7 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
index 4dd3e382..17670ad4 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.util.RdfIOUtil;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -41,12 +41,11 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
index 02a0c2c9..df00a48f 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java
index bea26a0a..6cd04f95 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/List_POST.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration;
-import org.fairdatapoint.util.RdfIOUtil;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.junit.jupiter.api.DisplayName;
@@ -41,7 +41,7 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
index 2cd5a765..60e80100 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog.member;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
index 164a5a02..f0ef12d3 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog.member;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.member.MemberCreateDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
similarity index 86%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
index 5838920c..78fc2f9d 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog.member;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.member;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +41,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
similarity index 81%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
index 8e8683aa..1fbcfd8c 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog.meta;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.api.dto.metadata.MetaDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.meta;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,9 +43,9 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
-import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
-import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
similarity index 81%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
index 574086ea..5da450c7 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.catalog.meta;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataRepository;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.catalog.meta;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,9 +40,9 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
-import static org.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
index c5be5c1a..b7be2fd4 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
index 60248194..7fb67551 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
index 5df98ab2..2d34bbaf 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
index 71f043c6..699ffe92 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.util.RdfIOUtil;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -41,12 +41,11 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
index d172aea5..bf18787c 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java
similarity index 89%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java
index 5e0ae296..d947ca7d 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/List_POST.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.util.RdfIOUtil;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
index ec6d9fee..a373bfaf 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset.member;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
index c51ea653..f6a85cbf 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset.member;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.member.MemberCreateDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
similarity index 86%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
index 33c44cbc..762d0b19 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset.member;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.member;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +41,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
similarity index 81%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
index 27e80f9d..aedf4f52 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset.meta;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.api.dto.metadata.MetaDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.meta;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,9 +43,9 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
-import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
-import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
similarity index 81%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
index b5ee63c6..da34ff6e 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.dataset.meta;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataRepository;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.dataset.meta;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,9 +40,9 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
-import static org.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
index 9f57c54f..95242668 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
index e5b52531..4860b253 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
index c92e2afb..d8b95663 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -34,7 +34,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
index a091bfad..746daf71 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.util.RdfIOUtil;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -40,12 +40,11 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java
index d88c7712..a4a84433 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/List_POST.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.util.RdfIOUtil;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
index fd2875c0..4b8d349d 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution.member;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
index 4548baaa..518be911 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution.member;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.member.MemberCreateDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberCreateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
similarity index 86%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
index 5f6f00f8..82e27026 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution.member;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.member;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +41,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
similarity index 80%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
index c538188d..9b0354e4 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution.meta;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.member.MemberDTO;
-import org.fairdatapoint.api.dto.metadata.MetaDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import org.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
-import org.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.member.MemberMapper;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.meta;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.membership.data.MembershipFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.member.MemberMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,9 +43,9 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
-import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
-import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
similarity index 81%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
index 4b963ca9..8f5935ec 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.distribution.meta;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataRepository;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.distribution.meta;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,9 +40,9 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
-import static org.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
similarity index 95%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
index 46bb7427..4b0f4c56 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.repository;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
index d66a4836..f9166f79 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.repository;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
index 6caa3ace..92fead69 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.repository;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
similarity index 95%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
index e42ad63e..84cdbc08 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.repository;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
index c7e0b643..807c16a7 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.repository;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.util.RdfIOUtil;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.util.RdfIOUtil;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -39,11 +39,10 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import static org.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.l;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
index 6bfaab74..3a73d95f 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.repository;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
similarity index 86%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
index dbd520de..a689085e 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.repository.meta;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.repository.meta;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.metadata.MetaDTO;
-import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import org.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaDTO;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,8 +38,8 @@
 import java.net.URI;
 import java.util.Map;
 
-import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
-import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
similarity index 80%
rename from src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
index 0f9975e5..03665cdf 100644
--- a/src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.metadata.repository.meta;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import org.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataRepository;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
+package org.fairdatateam.fairdatapoint.acceptance.metadata.repository.meta;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.metadata.data.MetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,9 +39,9 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
-import static org.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
+import static org.fairdatateam.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
similarity index 95%
rename from src/test/java/org/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
index 7e2b540d..466fde0a 100644
--- a/src/test/java/org/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.openapi;
+package org.fairdatateam.fairdatapoint.acceptance.openapi;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
similarity index 96%
rename from src/test/java/org/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
index 1691dfdd..ac276def 100644
--- a/src/test/java/org/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.openapi;
+package org.fairdatateam.fairdatapoint.acceptance.openapi;
 
-import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/resource/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java
similarity index 86%
rename from src/test/java/org/fairdatapoint/acceptance/resource/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java
index 504d893f..fbb8705a 100644
--- a/src/test/java/org/fairdatapoint/acceptance/resource/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_DELETE.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.resource;
+package org.fairdatateam.fairdatapoint.acceptance.resource;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +37,8 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/resource/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/resource/Detail_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java
index 7f538809..6999affd 100644
--- a/src/test/java/org/fairdatapoint/acceptance/resource/Detail_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_GET.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.resource;
+package org.fairdatateam.fairdatapoint.acceptance.resource;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/resource/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java
similarity index 82%
rename from src/test/java/org/fairdatapoint/acceptance/resource/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java
index 8044a50a..5f21ddfb 100644
--- a/src/test/java/org/fairdatapoint/acceptance/resource/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/Detail_PUT.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.resource;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.resource.ResourceDefinitionMapper;
+package org.fairdatateam.fairdatapoint.acceptance.resource;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +37,9 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/resource/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java
similarity index 90%
rename from src/test/java/org/fairdatapoint/acceptance/resource/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java
index b7f17fcb..cc2955db 100644
--- a/src/test/java/org/fairdatapoint/acceptance/resource/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_GET.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.resource;
+package org.fairdatateam.fairdatapoint.acceptance.resource;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/resource/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java
similarity index 83%
rename from src/test/java/org/fairdatapoint/acceptance/resource/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java
index 1b90ced1..e6b40980 100644
--- a/src/test/java/org/fairdatapoint/acceptance/resource/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/resource/List_POST.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.resource;
+package org.fairdatateam.fairdatapoint.acceptance.resource;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.resource.ResourceDefinitionMapper;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionMapper;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +35,8 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java
similarity index 85%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Common.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java
index c9028cd5..1accfcbe 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Common.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Common.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Content_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java
similarity index 88%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Content_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java
index 6eb1642c..b2a94cbf 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Content_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Content_GET.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java
similarity index 88%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java
index b27e8476..14c004ea 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_DELETE.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,8 +39,8 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java
similarity index 85%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Detail_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java
index 49a97123..41df1271 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Detail_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Detail_GET.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +37,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Draft_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java
similarity index 85%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Draft_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java
index c73f2cf0..33b6b18c 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Draft_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_DELETE.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +36,8 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.*;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.*;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Draft_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java
similarity index 83%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Draft_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java
index a0a6d7e2..640e8a59 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Draft_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_GET.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +37,8 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.*;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.*;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Draft_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java
similarity index 90%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Draft_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java
index 90b912fa..9992d533 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Draft_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Draft_PUT.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +42,9 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.core.Is.is;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Import_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java
similarity index 97%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Import_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java
index c19f6efa..fbca9cdf 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Import_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Import_POST.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java
similarity index 95%
rename from src/test/java/org/fairdatapoint/acceptance/schema/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java
index 609498c2..d13add13 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_GET.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java
similarity index 84%
rename from src/test/java/org/fairdatapoint/acceptance/schema/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java
index 194ca6fe..8033e2c9 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/List_POST.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +36,8 @@
 import java.net.URI;
 import java.util.Collections;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Public_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java
similarity index 90%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Public_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java
index ec26277a..a39cf9b3 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Public_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Public_GET.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.entity.schema.SemVer;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Version_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java
similarity index 90%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Version_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java
index 1f4cd648..166c524a 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Version_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_DELETE.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,9 +39,9 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Version_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java
similarity index 85%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Version_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java
index 5e4608a2..b1051dad 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Version_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_GET.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +37,9 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestGet;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Version_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java
similarity index 83%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Version_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java
index 06ca4987..33725bec 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Version_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Version_PUT.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaUpdateDTO;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.schema.MetadataSchema;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaUpdateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,9 +38,9 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/schema/Versions_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java
similarity index 89%
rename from src/test/java/org/fairdatapoint/acceptance/schema/Versions_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java
index 1fae6900..c7b7af5d 100644
--- a/src/test/java/org/fairdatapoint/acceptance/schema/Versions_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/schema/Versions_POST.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.schema;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
-import org.fairdatapoint.api.dto.schema.MetadataSchemaReleaseDTO;
-import org.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
-import org.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
-import org.fairdatapoint.entity.schema.MetadataSchema;
-import org.fairdatapoint.entity.schema.MetadataSchemaDraft;
+package org.fairdatateam.fairdatapoint.acceptance.schema;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
+import org.fairdatateam.fairdatapoint.api.dto.schema.MetadataSchemaReleaseDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.schema.data.MetadataSchemaFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.MetadataSchemaRepository;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatateam.fairdatapoint.entity.schema.MetadataSchemaDraft;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,8 +40,8 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/Filters_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java
similarity index 90%
rename from src/test/java/org/fairdatapoint/acceptance/search/Filters_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java
index c6b67b61..d6cde0a4 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/Filters_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/Filters_GET.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search;
+package org.fairdatateam.fairdatapoint.acceptance.search;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.search.SearchFilterDTO;
-import org.fairdatapoint.database.mongo.repository.SettingsRepository;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchFilterDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/List_POST.java
similarity index 90%
rename from src/test/java/org/fairdatapoint/acceptance/search/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/List_POST.java
index cf9d0a99..0ae31428 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/List_POST.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search;
+package org.fairdatateam.fairdatapoint.acceptance.search;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.search.SearchQueryDTO;
-import org.fairdatapoint.api.dto.search.SearchResultDTO;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchResultDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/query/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_GET.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/acceptance/search/query/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_GET.java
index f1a4fd31..76a1dbd3 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/query/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_GET.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search.query;
+package org.fairdatateam.fairdatapoint.acceptance.search.query;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.search.SearchQueryTemplateDTO;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryTemplateDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/query/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_POST.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/acceptance/search/query/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_POST.java
index 52a11c78..77242a4c 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/query/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/List_POST.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search.query;
+package org.fairdatateam.fairdatapoint.acceptance.search.query;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
-import org.fairdatapoint.api.dto.search.SearchResultDTO;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchResultDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
index d4a30192..7119cf59 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search.query.saved;
+package org.fairdatateam.fairdatapoint.acceptance.search.query.saved;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures;
-import org.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
-import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
similarity index 95%
rename from src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
index cdd95ddc..3fd557cf 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search.query.saved;
+package org.fairdatateam.fairdatapoint.acceptance.search.query.saved;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import org.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures;
-import org.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
-import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
similarity index 92%
rename from src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
index 0e3738e6..15811512 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search.query.saved;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import org.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures;
-import org.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
-import org.fairdatapoint.entity.search.SearchSavedQuery;
-import org.fairdatapoint.entity.search.SearchSavedQueryType;
-import org.fairdatapoint.util.KnownUUIDs;
+package org.fairdatateam.fairdatapoint.acceptance.search.query.saved;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java
index 21a7f5de..226113b9 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_GET.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search.query.saved;
+package org.fairdatateam.fairdatapoint.acceptance.search.query.saved;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import org.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures;
-import org.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
-import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.search.SearchSavedQueryFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQuery;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java
similarity index 89%
rename from src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java
index ad7e6b3e..20942806 100644
--- a/src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/search/query/saved/List_POST.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.search.query.saved;
+package org.fairdatateam.fairdatapoint.acceptance.search.query.saved;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import org.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
-import org.fairdatapoint.entity.search.SearchSavedQueryType;
-import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SearchSavedQueryRepository;
+import org.fairdatateam.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.fairdatateam.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/fairdatapoint/acceptance/settings/List_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_DELETE.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/settings/List_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_DELETE.java
index 59579c7c..cf032843 100644
--- a/src/test/java/org/fairdatapoint/acceptance/settings/List_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_DELETE.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.settings;
+package org.fairdatateam.fairdatapoint.acceptance.settings;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.settings.SettingsDTO;
-import org.fairdatapoint.database.mongo.repository.SettingsRepository;
-import org.fairdatapoint.entity.settings.*;
-import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.settings.*;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsCache;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/fairdatapoint/acceptance/settings/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_GET.java
similarity index 92%
rename from src/test/java/org/fairdatapoint/acceptance/settings/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_GET.java
index 3e4c8820..09c41bed 100644
--- a/src/test/java/org/fairdatapoint/acceptance/settings/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_GET.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.settings;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.settings.SettingsDTO;
-import org.fairdatapoint.database.mongo.repository.SettingsRepository;
-import org.fairdatapoint.entity.settings.Settings;
-import org.fairdatapoint.entity.settings.SettingsMetricsEntry;
-import org.fairdatapoint.entity.settings.SettingsPing;
-import org.fairdatapoint.service.settings.SettingsCache;
+package org.fairdatateam.fairdatapoint.acceptance.settings;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.settings.SettingsDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsMetricsEntry;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsPing;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsCache;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/fairdatapoint/acceptance/settings/List_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_PUT.java
similarity index 94%
rename from src/test/java/org/fairdatapoint/acceptance/settings/List_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_PUT.java
index c1919645..6fc258f8 100644
--- a/src/test/java/org/fairdatapoint/acceptance/settings/List_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/settings/List_PUT.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.settings;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.settings.*;
-import org.fairdatapoint.database.mongo.repository.SettingsRepository;
-import org.fairdatapoint.entity.settings.Settings;
-import org.fairdatapoint.entity.settings.SettingsMetricsEntry;
-import org.fairdatapoint.entity.settings.SettingsPing;
-import org.fairdatapoint.service.settings.SettingsCache;
+package org.fairdatateam.fairdatapoint.acceptance.settings;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.settings.*;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.SettingsRepository;
+import org.fairdatateam.fairdatapoint.entity.settings.Settings;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsMetricsEntry;
+import org.fairdatateam.fairdatapoint.entity.settings.SettingsPing;
+import org.fairdatateam.fairdatapoint.service.settings.SettingsCache;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/fairdatapoint/acceptance/token/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java
similarity index 92%
rename from src/test/java/org/fairdatapoint/acceptance/token/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java
index e4e38817..938c1f00 100644
--- a/src/test/java/org/fairdatapoint/acceptance/token/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/token/List_POST.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.token;
+package org.fairdatateam.fairdatapoint.acceptance.token;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.auth.AuthDTO;
-import org.fairdatapoint.api.dto.auth.TokenDTO;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.auth.AuthDTO;
+import org.fairdatateam.fairdatapoint.api.dto.auth.TokenDTO;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/Common.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Common.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/acceptance/user/Common.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Common.java
index bd843d48..1ce859ad 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/Common.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Common.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
+package org.fairdatateam.fairdatapoint.acceptance.user;
 
-import org.fairdatapoint.api.dto.user.UserChangeDTO;
-import org.fairdatapoint.api.dto.user.UserCreateDTO;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.api.dto.user.UserProfileChangeDTO;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserCreateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserProfileChangeDTO;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/Current_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java
similarity index 86%
rename from src/test/java/org/fairdatapoint/acceptance/user/Current_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java
index 6fe83b8f..7919d570 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/Current_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Current_GET.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
+package org.fairdatateam.fairdatapoint.acceptance.user;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +37,7 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java
similarity index 88%
rename from src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java
index e542ab55..44686dd9 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_PUT.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
+package org.fairdatateam.fairdatapoint.acceptance.user;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.api.dto.user.UserProfileChangeDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserProfileChangeDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
similarity index 85%
rename from src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
index 2b287af8..ba788ec3 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
+package org.fairdatateam.fairdatapoint.acceptance.user;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.api.dto.user.UserPasswordDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserPasswordDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@
 
 import java.net.URI;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/Detail_DELETE.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java
similarity index 84%
rename from src/test/java/org/fairdatapoint/acceptance/user/Detail_DELETE.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java
index 930d292d..3726b7d8 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/Detail_DELETE.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_DELETE.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
+package org.fairdatateam.fairdatapoint.acceptance.user;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +37,9 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/Detail_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java
similarity index 84%
rename from src/test/java/org/fairdatapoint/acceptance/user/Detail_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java
index 6ba59a19..18319691 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/Detail_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_GET.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
+package org.fairdatateam.fairdatapoint.acceptance.user;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,8 +38,8 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/Detail_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java
similarity index 83%
rename from src/test/java/org/fairdatapoint/acceptance/user/Detail_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java
index 5b384917..a86cd048 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/Detail_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_PUT.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.user.UserChangeDTO;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.entity.user.UserRole;
+package org.fairdatateam.fairdatapoint.acceptance.user;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserChangeDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.entity.user.UserRole;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,9 +38,9 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/Detail_Password_PUT.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java
similarity index 82%
rename from src/test/java/org/fairdatapoint/acceptance/user/Detail_Password_PUT.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java
index b7a0a02e..09630a69 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/Detail_Password_PUT.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/Detail_Password_PUT.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
+package org.fairdatateam.fairdatapoint.acceptance.user;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.api.dto.user.UserPasswordDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserPasswordDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,9 +39,9 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static org.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
+import static org.fairdatateam.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/List_GET.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java
similarity index 88%
rename from src/test/java/org/fairdatapoint/acceptance/user/List_GET.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java
index bb1cdc7b..60769b0d 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/List_GET.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_GET.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
+package org.fairdatateam.fairdatapoint.acceptance.user;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +37,7 @@
 import java.net.URI;
 import java.util.List;
 
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/acceptance/user/List_POST.java b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java
similarity index 85%
rename from src/test/java/org/fairdatapoint/acceptance/user/List_POST.java
rename to src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java
index 0d98c7b6..96df0d7b 100644
--- a/src/test/java/org/fairdatapoint/acceptance/user/List_POST.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/acceptance/user/List_POST.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.acceptance.user;
-
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.api.dto.user.UserCreateDTO;
-import org.fairdatapoint.api.dto.user.UserDTO;
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.entity.user.User;
+package org.fairdatateam.fairdatapoint.acceptance.user;
+
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserCreateDTO;
+import org.fairdatateam.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.entity.user.User;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +37,8 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
-import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.fairdatateam.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/config/MetadataTestConfig.java b/src/test/java/org/fairdatateam/fairdatapoint/config/MetadataTestConfig.java
similarity index 97%
rename from src/test/java/org/fairdatapoint/config/MetadataTestConfig.java
rename to src/test/java/org/fairdatateam/fairdatapoint/config/MetadataTestConfig.java
index cc4d2cc7..dec92af1 100644
--- a/src/test/java/org/fairdatapoint/config/MetadataTestConfig.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/config/MetadataTestConfig.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.ValueFactory;
diff --git a/src/test/java/org/fairdatapoint/config/RepositoryTestConfig.java b/src/test/java/org/fairdatateam/fairdatapoint/config/RepositoryTestConfig.java
similarity index 97%
rename from src/test/java/org/fairdatapoint/config/RepositoryTestConfig.java
rename to src/test/java/org/fairdatateam/fairdatapoint/config/RepositoryTestConfig.java
index ac44ba2f..1f4e31db 100644
--- a/src/test/java/org/fairdatapoint/config/RepositoryTestConfig.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/config/RepositoryTestConfig.java
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.config;
+package org.fairdatateam.fairdatapoint.config;
 
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryException;
diff --git a/src/test/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
index c3cfa97c..3709b74a 100644
--- a/src/test/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.repository.catalog;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.catalog;
 
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
@@ -41,8 +41,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/src/test/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
similarity index 89%
rename from src/test/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
index e830e721..fd5a5b10 100644
--- a/src/test/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
@@ -25,11 +25,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.database.rdf.repository.common;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.common;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -40,9 +40,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getLanguage;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getLanguage;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
index eb4ac30a..fefa761d 100644
--- a/src/test/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.database.rdf.repository.generic;
+package org.fairdatateam.fairdatapoint.database.rdf.repository.generic;
 
-import org.fairdatapoint.WebIntegrationTest;
-import org.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.WebIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
@@ -37,9 +37,9 @@
 
 import java.util.ArrayList;
 
-import static org.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getLanguage;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getLanguage;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.notNullValue;
diff --git a/src/test/java/org/fairdatapoint/entity/schema/SemVerTest.java b/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java
similarity index 96%
rename from src/test/java/org/fairdatapoint/entity/schema/SemVerTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java
index 9d89f5ab..dafbd4e8 100644
--- a/src/test/java/org/fairdatapoint/entity/schema/SemVerTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/entity/schema/SemVerTest.java
@@ -20,8 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.entity.schema;
+package org.fairdatateam.fairdatapoint.entity.schema;
 
+import org.fairdatateam.fairdatapoint.entity.schema.SemVer;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
diff --git a/src/test/java/org/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
similarity index 80%
rename from src/test/java/org/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
index b3a1f412..b6a2c5fd 100644
--- a/src/test/java/org/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
@@ -20,17 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.index.harvester;
-
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
-import org.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactoryImpl;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
-import org.fairdatapoint.service.resource.ResourceDefinitionCache;
-import org.fairdatapoint.vocabulary.FDP;
+package org.fairdatateam.fairdatapoint.service.index.harvester;
+
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactoryImpl;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.vocabulary.FDP;
 import org.eclipse.rdf4j.model.Model;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -47,9 +48,9 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static org.fairdatapoint.util.RdfIOUtil.write;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.write;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
diff --git a/src/test/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
similarity index 84%
rename from src/test/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
index 591dd348..0e95d9ae 100644
--- a/src/test/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.catalog;
+package org.fairdatateam.fairdatapoint.service.metadata.catalog;
 
-import org.fairdatapoint.BaseIntegrationTest;
-import org.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepositoryImpl;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.BaseIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepositoryImpl;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -41,9 +41,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getThemeTaxonomies;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getThemeTaxonomies;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
index c16c828a..898f6afd 100644
--- a/src/test/java/org/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.metadata.generic;
-
-import org.fairdatapoint.BaseIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.metadata.common.MetadataService;
-import org.fairdatapoint.utils.AuthHelper;
-import org.fairdatapoint.utils.TestRdfMetadataFixtures;
+package org.fairdatateam.fairdatapoint.service.metadata.generic;
+
+import org.fairdatateam.fairdatapoint.BaseIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatateam.fairdatapoint.utils.AuthHelper;
+import org.fairdatateam.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,9 +40,7 @@
 import java.time.OffsetDateTime;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.entity.metadata.MetadataGetter.*;
-import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
similarity index 87%
rename from src/test/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
index 9cda96aa..fa2c144c 100644
--- a/src/test/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
@@ -25,17 +25,18 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.service.metadata.metric;
+package org.fairdatateam.fairdatapoint.service.metadata.metric;
 
-import org.fairdatapoint.BaseIntegrationTest;
-import org.fairdatapoint.entity.metadata.Metric;
+import org.fairdatateam.fairdatapoint.BaseIntegrationTest;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metric;
 import org.eclipse.rdf4j.model.IRI;
+import org.fairdatateam.fairdatapoint.service.metadata.metric.MetricsMetadataService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
similarity index 88%
rename from src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
index 3febc08b..bdbb1657 100644
--- a/src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
@@ -20,12 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.resource;
+package org.fairdatateam.fairdatapoint.service.resource;
 
-import org.fairdatapoint.BaseIntegrationTest;
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.BaseIntegrationTest;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
similarity index 91%
rename from src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
index a2714da6..abd75f96 100644
--- a/src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
@@ -20,13 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.service.resource;
-
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
+package org.fairdatateam.fairdatapoint.service.resource;
+
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionCache;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionValidator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
diff --git a/src/test/java/org/fairdatapoint/utils/AuthHelper.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java
similarity index 89%
rename from src/test/java/org/fairdatapoint/utils/AuthHelper.java
rename to src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java
index 80057548..b1e8196c 100644
--- a/src/test/java/org/fairdatapoint/utils/AuthHelper.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/AuthHelper.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.utils;
+package org.fairdatateam.fairdatapoint.utils;
 
-import org.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
-import org.fairdatapoint.service.security.MongoAuthenticationService;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.user.data.UserFixtures;
+import org.fairdatateam.fairdatapoint.service.security.MongoAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/src/test/java/org/fairdatapoint/utils/CustomPageImpl.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/CustomPageImpl.java
similarity index 97%
rename from src/test/java/org/fairdatapoint/utils/CustomPageImpl.java
rename to src/test/java/org/fairdatateam/fairdatapoint/utils/CustomPageImpl.java
index 38f52962..50625837 100644
--- a/src/test/java/org/fairdatapoint/utils/CustomPageImpl.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/CustomPageImpl.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.utils;
+package org.fairdatateam.fairdatapoint.utils;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
diff --git a/src/test/java/org/fairdatapoint/utils/HttpUtilTest.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/HttpUtilTest.java
similarity index 97%
rename from src/test/java/org/fairdatapoint/utils/HttpUtilTest.java
rename to src/test/java/org/fairdatateam/fairdatapoint/utils/HttpUtilTest.java
index f3678879..dca2e208 100644
--- a/src/test/java/org/fairdatapoint/utils/HttpUtilTest.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/HttpUtilTest.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.utils;
+package org.fairdatateam.fairdatapoint.utils;
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.rdf4j.model.IRI;
@@ -28,7 +28,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.fairdatapoint.util.HttpUtil.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/org/fairdatapoint/utils/TestIndexEntryFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java
similarity index 93%
rename from src/test/java/org/fairdatapoint/utils/TestIndexEntryFixtures.java
rename to src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java
index 693e6249..3fe55604 100644
--- a/src/test/java/org/fairdatapoint/utils/TestIndexEntryFixtures.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestIndexEntryFixtures.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.utils;
+package org.fairdatateam.fairdatapoint.utils;
 
-import org.fairdatapoint.entity.index.entry.IndexEntry;
-import org.fairdatapoint.entity.index.entry.IndexEntryState;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatateam.fairdatapoint.entity.index.entry.IndexEntryState;
 
 import java.time.Instant;
 import java.util.ArrayList;
diff --git a/src/test/java/org/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java
similarity index 89%
rename from src/test/java/org/fairdatapoint/utils/TestRdfMetadataFixtures.java
rename to src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java
index 5617906b..fac4077d 100644
--- a/src/test/java/org/fairdatapoint/utils/TestRdfMetadataFixtures.java
+++ b/src/test/java/org/fairdatateam/fairdatapoint/utils/TestRdfMetadataFixtures.java
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.utils;
+package org.fairdatateam.fairdatapoint.utils;
 
-import org.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
-import org.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
-import org.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
+import org.fairdatateam.fairdatapoint.database.mongo.migration.development.resource.data.ResourceDefinitionFixtures;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
+import org.fairdatateam.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
-import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatateam.fairdatapoint.entity.metadata.MetadataGetter.getUri;
 
 @Service
 public class TestRdfMetadataFixtures extends RdfMetadataFixtures {