diff --git a/Dockerfile b/Dockerfile
index 86a03781f..25121565f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright © 2017 DTL
+# Copyright © 2016-2024 FAIR Data Team
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/Dockerfile.build b/Dockerfile.build
index f0a435ffe..85aeb8191 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright © 2017 DTL
+# Copyright © 2024 FAIR Data Team
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/LICENSE b/LICENSE
index 627c9394a..4137c74fe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 FAIR Data Team
+Copyright (c) 2024 FAIR Data Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/pom.xml b/pom.xml
index ebebbdcf1..ba452675b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
         <version>3.2.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>nl.dtls</groupId>
+    <groupId>org.fairdatapoint</groupId>
     <artifactId>fairdatapoint</artifactId>
     <version>1.17.1</version>
     <packaging>jar</packaging>
@@ -276,7 +276,8 @@
                 <configuration>
                     <header>com/mycila/maven/plugin/license/templates/MIT.txt</header>
                     <properties>
-                        <owner>DTL</owner>
+                        <owner>FAIR Data Team</owner>
+                        <year>2016-2024</year>
                     </properties>
                     <mapping>
                         <java>JAVADOC_STYLE</java>
@@ -331,7 +332,7 @@
                         </goals>
                         <configuration>
                             <classifier>spring-boot</classifier>
-                            <mainClass>nl.dtls.fairdatapoint.Application</mainClass>
+                            <mainClass>org.fairdatapoint.Application</mainClass>
                         </configuration>
                     </execution>
                     <execution>
@@ -416,7 +417,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <package>nl.dtls.fairdatapoint.vocabulary</package>
+                    <package>org.fairdatapoint.vocabulary</package>
                     <addGeneratedAnnotation>false</addGeneratedAnnotation>
                     <vocabularies>
                         <vocabulary>
diff --git a/src/main/java/nl/dtls/fairdatapoint/Application.java b/src/main/java/org/fairdatapoint/Application.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/Application.java
rename to src/main/java/org/fairdatapoint/Application.java
index c9ce5bb46..596e8418b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/Application.java
+++ b/src/main/java/org/fairdatapoint/Application.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint;
+package org.fairdatapoint;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -32,8 +32,8 @@
 @SpringBootApplication
 @EnableWebMvc
 @EnableAsync
-@ComponentScan(basePackages = "nl.dtls.fairdatapoint.*")
-@ConfigurationPropertiesScan("nl.dtls.fairdatapoint.config.*")
+@ComponentScan(basePackages = "org.fairdatapoint.*")
+@ConfigurationPropertiesScan("org.fairdatapoint.config.*")
 public class Application {
 
     private static final String PROFILES_PROPERTY = "spring.profiles.active";
diff --git a/src/main/java/nl/dtls/fairdatapoint/Profiles.java b/src/main/java/org/fairdatapoint/Profiles.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/Profiles.java
rename to src/main/java/org/fairdatapoint/Profiles.java
index 0969ba5db..01c3766ea 100644
--- a/src/main/java/nl/dtls/fairdatapoint/Profiles.java
+++ b/src/main/java/org/fairdatapoint/Profiles.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint;
+package org.fairdatapoint;
 
 public class Profiles {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/apikey/ApiKeyController.java b/src/main/java/org/fairdatapoint/api/controller/apikey/ApiKeyController.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/apikey/ApiKeyController.java
rename to src/main/java/org/fairdatapoint/api/controller/apikey/ApiKeyController.java
index c5d6ce8a9..1b00b140e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/apikey/ApiKeyController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/apikey/ApiKeyController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.apikey;
+package org.fairdatapoint.api.controller.apikey;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.service.apikey.ApiKeyService;
+import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatapoint.service.apikey.ApiKeyService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/config/ConfigController.java b/src/main/java/org/fairdatapoint/api/controller/config/ConfigController.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/config/ConfigController.java
rename to src/main/java/org/fairdatapoint/api/controller/config/ConfigController.java
index e4932f5ad..6925103e7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/config/ConfigController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/config/ConfigController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.config;
+package org.fairdatapoint.api.controller.config;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.config.BootstrapConfigDTO;
-import nl.dtls.fairdatapoint.service.config.ConfigService;
+import org.fairdatapoint.api.dto.config.BootstrapConfigDTO;
+import org.fairdatapoint.service.config.ConfigService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java b/src/main/java/org/fairdatapoint/api/controller/dashboard/DashboardController.java
similarity index 82%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java
rename to src/main/java/org/fairdatapoint/api/controller/dashboard/DashboardController.java
index 57f9446ed..5b09a0b54 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/dashboard/DashboardController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.dashboard;
+package org.fairdatapoint.api.controller.dashboard;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
-import nl.dtls.fairdatapoint.service.dashboard.DashboardService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
+import org.fairdatapoint.service.dashboard.DashboardService;
+import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -38,9 +38,9 @@
 
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.util.HttpUtil.getRequestURL;
-import static nl.dtls.fairdatapoint.util.RdfUtil.removeLastPartOfIRI;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.HttpUtil.getRequestURL;
+import static org.fairdatapoint.util.RdfUtil.removeLastPartOfIRI;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Client")
 @RestController
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/org/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
rename to src/main/java/org/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
index e836f148f..933fe071d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
+++ b/src/main/java/org/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,17 +25,17 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.api.controller.exception;
+package org.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 nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.entity.exception.*;
-import nl.dtls.fairdatapoint.entity.index.exception.AbstractIndexException;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
+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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.query.MalformedQueryException;
@@ -57,8 +57,8 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.util.RdfIOUtil.getWriterConfig;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.RdfIOUtil.getWriterConfig;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @ControllerAdvice
 @Slf4j
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/form/FormAutocompleteController.java b/src/main/java/org/fairdatapoint/api/controller/form/FormAutocompleteController.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/form/FormAutocompleteController.java
rename to src/main/java/org/fairdatapoint/api/controller/form/FormAutocompleteController.java
index aaa7f50cb..df753a03f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/form/FormAutocompleteController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/form/FormAutocompleteController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.form;
+package org.fairdatapoint.api.controller.form;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
-import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
-import nl.dtls.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
+import org.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
+import org.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
+import org.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexAdminController.java b/src/main/java/org/fairdatapoint/api/controller/index/IndexAdminController.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexAdminController.java
rename to src/main/java/org/fairdatapoint/api/controller/index/IndexAdminController.java
index c1d1560fc..4979201c8 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexAdminController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/index/IndexAdminController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.index;
+package org.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,13 +28,13 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.service.UtilityService;
-import nl.dtls.fairdatapoint.service.index.entry.IndexEntryService;
-import nl.dtls.fairdatapoint.service.index.event.EventService;
-import nl.dtls.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.service.UtilityService;
+import org.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatapoint.service.index.event.EventService;
+import org.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexEntryController.java b/src/main/java/org/fairdatapoint/api/controller/index/IndexEntryController.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexEntryController.java
rename to src/main/java/org/fairdatapoint/api/controller/index/IndexEntryController.java
index b0a4d11ed..950d5f7b5 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexEntryController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/index/IndexEntryController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,23 +20,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.index;
+package org.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryUpdateDTO;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.service.index.entry.IndexEntryService;
-import nl.dtls.fairdatapoint.service.index.event.EventService;
-import nl.dtls.fairdatapoint.service.index.harvester.HarvesterService;
-import nl.dtls.fairdatapoint.service.index.webhook.WebhookService;
+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.IndexEntryUpdateDTO;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatapoint.service.index.event.EventService;
+import org.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatapoint.service.index.webhook.WebhookService;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexPingController.java b/src/main/java/org/fairdatapoint/api/controller/index/IndexPingController.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexPingController.java
rename to src/main/java/org/fairdatapoint/api/controller/index/IndexPingController.java
index 7751e39d1..ed51b2c0c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexPingController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/index/IndexPingController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.index;
+package org.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -32,13 +32,13 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.service.UtilityService;
-import nl.dtls.fairdatapoint.service.index.entry.IndexEntryService;
-import nl.dtls.fairdatapoint.service.index.event.EventService;
-import nl.dtls.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.service.UtilityService;
+import org.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatapoint.service.index.event.EventService;
+import org.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexSettingsController.java b/src/main/java/org/fairdatapoint/api/controller/index/IndexSettingsController.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexSettingsController.java
rename to src/main/java/org/fairdatapoint/api/controller/index/IndexSettingsController.java
index 61fa1b600..502bf28b4 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexSettingsController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/index/IndexSettingsController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.index;
+package org.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import nl.dtls.fairdatapoint.service.index.settings.IndexSettingsService;
+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.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/label/LabelController.java b/src/main/java/org/fairdatapoint/api/controller/label/LabelController.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/label/LabelController.java
rename to src/main/java/org/fairdatapoint/api/controller/label/LabelController.java
index 962f2e83d..eac83f85b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/label/LabelController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/label/LabelController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.label;
+package org.fairdatapoint.api.controller.label;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.label.LabelDTO;
-import nl.dtls.fairdatapoint.service.label.LabelService;
+import org.fairdatapoint.api.dto.label.LabelDTO;
+import org.fairdatapoint.service.label.LabelService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/membership/MembershipController.java b/src/main/java/org/fairdatapoint/api/controller/membership/MembershipController.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/membership/MembershipController.java
rename to src/main/java/org/fairdatapoint/api/controller/membership/MembershipController.java
index 43797367b..25cc5ae69 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/membership/MembershipController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/membership/MembershipController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.membership;
+package org.fairdatapoint.api.controller.membership;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipDTO;
-import nl.dtls.fairdatapoint.service.membership.MembershipService;
+import org.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatapoint.service.membership.MembershipService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericController.java b/src/main/java/org/fairdatapoint/api/controller/metadata/GenericController.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericController.java
rename to src/main/java/org/fairdatapoint/api/controller/metadata/GenericController.java
index f18e96252..446e36d43 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/metadata/GenericController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,29 +20,29 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.metadata;
+package org.fairdatapoint.api.controller.metadata;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
 import jakarta.servlet.http.HttpServletResponse;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.entity.exception.ForbiddenException;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
-import nl.dtls.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
-import nl.dtls.fairdatapoint.service.metadata.state.MetadataStateService;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
-import nl.dtls.fairdatapoint.service.schema.MetadataSchemaService;
-import nl.dtls.fairdatapoint.service.search.SearchFilterCache;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
+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.resource.ResourceDefinition;
+import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatapoint.entity.user.UserAccount;
+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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Value;
@@ -63,11 +63,11 @@
 import java.util.Optional;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.util.HttpUtil.*;
-import static nl.dtls.fairdatapoint.util.RdfIOUtil.changeBaseUri;
-import static nl.dtls.fairdatapoint.util.RdfIOUtil.read;
-import static nl.dtls.fairdatapoint.util.RdfUtil.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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;
 
 @Tag(name = "Metadata")
 @RestController
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMemberController.java b/src/main/java/org/fairdatapoint/api/controller/metadata/GenericMemberController.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMemberController.java
rename to src/main/java/org/fairdatapoint/api/controller/metadata/GenericMemberController.java
index f172a0cb7..96eface8c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMemberController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/metadata/GenericMemberController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,20 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.metadata;
+package org.fairdatapoint.api.controller.metadata;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.member.MemberCreateDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.metadata.Metadata;
-import nl.dtls.fairdatapoint.service.member.MemberService;
-import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
+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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.http.HttpStatus;
@@ -44,8 +44,8 @@
 import java.util.List;
 import java.util.UUID;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier;
-import static nl.dtls.fairdatapoint.util.HttpUtil.getMetadataIRI;
+import static org.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier;
+import static org.fairdatapoint.util.HttpUtil.getMetadataIRI;
 
 @Tag(name = "Authentication and Authorization")
 @RestController
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMetaController.java b/src/main/java/org/fairdatapoint/api/controller/metadata/GenericMetaController.java
similarity index 80%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMetaController.java
rename to src/main/java/org/fairdatapoint/api/controller/metadata/GenericMetaController.java
index 269bdb064..a9ab34672 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMetaController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/metadata/GenericMetaController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,28 +20,28 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.metadata;
+package org.fairdatapoint.api.controller.metadata;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaPathDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.entity.metadata.Metadata;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberService;
-import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
-import nl.dtls.fairdatapoint.service.metadata.state.MetadataStateService;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
+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.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.entity.user.UserAccount;
+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.fairdatapoint.service.user.CurrentUserService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
@@ -51,11 +51,11 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getTitle;
-import static nl.dtls.fairdatapoint.util.HttpUtil.getMetadataIRI;
-import static nl.dtls.fairdatapoint.util.RdfUtil.getStringObjectBy;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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;
 
 @Tag(name = "Metadata")
 @RestController
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/profile/ProfileController.java b/src/main/java/org/fairdatapoint/api/controller/profile/ProfileController.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/profile/ProfileController.java
rename to src/main/java/org/fairdatapoint/api/controller/profile/ProfileController.java
index e453414be..573f29078 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/profile/ProfileController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/profile/ProfileController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.profile;
+package org.fairdatapoint.api.controller.profile;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.service.profile.ProfileService;
+import org.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatapoint.service.profile.ProfileService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.http.HttpStatus;
@@ -37,8 +37,8 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.util.HttpUtil.getRequestURL;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.HttpUtil.getRequestURL;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Client")
 @RestController
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/reset/ResetController.java b/src/main/java/org/fairdatapoint/api/controller/reset/ResetController.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/reset/ResetController.java
rename to src/main/java/org/fairdatapoint/api/controller/reset/ResetController.java
index d9de2f2ea..b4d78e498 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/reset/ResetController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/reset/ResetController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.reset;
+package org.fairdatapoint.api.controller.reset;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.reset.ResetDTO;
-import nl.dtls.fairdatapoint.service.reset.ResetService;
+import org.fairdatapoint.api.dto.reset.ResetDTO;
+import org.fairdatapoint.service.reset.ResetService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/resource/ResourceDefinitionController.java b/src/main/java/org/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
rename to src/main/java/org/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
index 2854781db..5a57b6c96 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/resource/ResourceDefinitionController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.resource;
+package org.fairdatapoint.api.controller.resource;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
+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.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/schema/MetadataSchemaController.java b/src/main/java/org/fairdatapoint/api/controller/schema/MetadataSchemaController.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/schema/MetadataSchemaController.java
rename to src/main/java/org/fairdatapoint/api/controller/schema/MetadataSchemaController.java
index 5ad03b110..4a3e7eede 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/schema/MetadataSchemaController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/schema/MetadataSchemaController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.schema;
+package org.fairdatapoint.api.controller.schema;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.schema.*;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.exception.UnauthorizedException;
-import nl.dtls.fairdatapoint.service.schema.MetadataSchemaService;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
+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.eclipse.rdf4j.model.Model;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchController.java b/src/main/java/org/fairdatapoint/api/controller/search/SearchController.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchController.java
rename to src/main/java/org/fairdatapoint/api/controller/search/SearchController.java
index 9dab294a8..92fb0e766 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/search/SearchController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.search;
+package org.fairdatapoint.api.controller.search;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.search.*;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.service.search.SearchService;
+import org.fairdatapoint.api.dto.search.*;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.service.search.SearchService;
 import org.eclipse.rdf4j.query.MalformedQueryException;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchSavedQueryController.java b/src/main/java/org/fairdatapoint/api/controller/search/SearchSavedQueryController.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchSavedQueryController.java
rename to src/main/java/org/fairdatapoint/api/controller/search/SearchSavedQueryController.java
index d27fa8fb5..4f8c1b6d3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchSavedQueryController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/search/SearchSavedQueryController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.search;
+package org.fairdatapoint.api.controller.search;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.search.SearchResultDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.service.search.SearchService;
-import nl.dtls.fairdatapoint.service.search.query.SearchSavedQueryService;
+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.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsController.java b/src/main/java/org/fairdatapoint/api/controller/settings/SettingsController.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsController.java
rename to src/main/java/org/fairdatapoint/api/controller/settings/SettingsController.java
index bf565d21c..b7e00b745 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/settings/SettingsController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.settings;
+package org.fairdatapoint.api.controller.settings;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsDTO;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
-import nl.dtls.fairdatapoint.service.settings.SettingsService;
+import org.fairdatapoint.api.dto.settings.SettingsDTO;
+import org.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
+import org.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/nl/dtls/fairdatapoint/api/controller/settings/SettingsDefaults.java b/src/main/java/org/fairdatapoint/api/controller/settings/SettingsDefaults.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsDefaults.java
rename to src/main/java/org/fairdatapoint/api/controller/settings/SettingsDefaults.java
index ce47b9054..e82736baa 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsDefaults.java
+++ b/src/main/java/org/fairdatapoint/api/controller/settings/SettingsDefaults.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.settings;
+package org.fairdatapoint.api.controller.settings;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.config.properties.PingProperties;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.entity.settings.SettingsMetric;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.config.properties.PingProperties;
+import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatapoint.entity.settings.SettingsMetric;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/sparql/QueryResponder.java b/src/main/java/org/fairdatapoint/api/controller/sparql/QueryResponder.java
similarity index 99%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/sparql/QueryResponder.java
rename to src/main/java/org/fairdatapoint/api/controller/sparql/QueryResponder.java
index 8a1302e6e..68c6fe941 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/sparql/QueryResponder.java
+++ b/src/main/java/org/fairdatapoint/api/controller/sparql/QueryResponder.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
  * THE SOFTWARE.
  */
 // Adapted from: https://github.com/eclipse/rdf4j/tree/main/spring-components/spring-boot-sparql-web
-package nl.dtls.fairdatapoint.api.controller.sparql;
+package org.fairdatapoint.api.controller.sparql;
 
 import static org.springframework.http.HttpHeaders.ACCEPT;
 import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/token/TokenController.java b/src/main/java/org/fairdatapoint/api/controller/token/TokenController.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/token/TokenController.java
rename to src/main/java/org/fairdatapoint/api/controller/token/TokenController.java
index b4b2e71fc..b3d366464 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/token/TokenController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/token/TokenController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.token;
+package org.fairdatapoint.api.controller.token;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.auth.AuthDTO;
-import nl.dtls.fairdatapoint.api.dto.auth.TokenDTO;
-import nl.dtls.fairdatapoint.service.jwt.JwtService;
+import org.fairdatapoint.api.dto.auth.AuthDTO;
+import org.fairdatapoint.api.dto.auth.TokenDTO;
+import org.fairdatapoint.service.jwt.JwtService;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/user/UserController.java b/src/main/java/org/fairdatapoint/api/controller/user/UserController.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/controller/user/UserController.java
rename to src/main/java/org/fairdatapoint/api/controller/user/UserController.java
index 0dae24c62..9ac58b3e5 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/controller/user/UserController.java
+++ b/src/main/java/org/fairdatapoint/api/controller/user/UserController.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.user;
+package org.fairdatapoint.api.controller.user;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.user.*;
-import nl.dtls.fairdatapoint.entity.exception.ForbiddenException;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.service.user.UserService;
+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.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/converter/ErrorConverter.java b/src/main/java/org/fairdatapoint/api/converter/ErrorConverter.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/converter/ErrorConverter.java
rename to src/main/java/org/fairdatapoint/api/converter/ErrorConverter.java
index dc7300413..67f94a566 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/converter/ErrorConverter.java
+++ b/src/main/java/org/fairdatapoint/api/converter/ErrorConverter.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,9 +25,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.api.converter;
+package org.fairdatapoint.api.converter;
 
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
+import org.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/nl/dtls/fairdatapoint/api/converter/RdfConverter.java b/src/main/java/org/fairdatapoint/api/converter/RdfConverter.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/api/converter/RdfConverter.java
rename to src/main/java/org/fairdatapoint/api/converter/RdfConverter.java
index 6e4a5d7f3..22d5a98e2 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/converter/RdfConverter.java
+++ b/src/main/java/org/fairdatapoint/api/converter/RdfConverter.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,9 +25,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.api.converter;
+package org.fairdatapoint.api.converter;
 
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
+import org.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/nl/dtls/fairdatapoint/api/dto/apikey/ApiKeyDTO.java b/src/main/java/org/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
index e81c1e452..dbbbf2642 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/apikey/ApiKeyDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.apikey;
+package org.fairdatapoint.api.dto.apikey;
 
 import lombok.*;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/auth/AuthDTO.java b/src/main/java/org/fairdatapoint/api/dto/auth/AuthDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/auth/AuthDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/auth/AuthDTO.java
index 53154e33d..3b7204e07 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/auth/AuthDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/auth/AuthDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.auth;
+package org.fairdatapoint.api.dto.auth;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/auth/TokenDTO.java b/src/main/java/org/fairdatapoint/api/dto/auth/TokenDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/auth/TokenDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/auth/TokenDTO.java
index 2587c4b49..0f2cd31db 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/auth/TokenDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/auth/TokenDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.auth;
+package org.fairdatapoint.api.dto.auth;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/common/BreadcrumbDTO.java b/src/main/java/org/fairdatapoint/api/dto/common/BreadcrumbDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/common/BreadcrumbDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/common/BreadcrumbDTO.java
index 4c6ff6825..61549c5cb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/common/BreadcrumbDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/common/BreadcrumbDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.common;
+package org.fairdatapoint.api.dto.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/config/BootstrapConfigDTO.java b/src/main/java/org/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
index 55f746eaa..e318fa6ea 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/config/BootstrapConfigDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.config;
+package org.fairdatapoint.api.dto.config;
 
 import lombok.*;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java b/src/main/java/org/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
index 0173b3128..dfa74ec6d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/dashboard/DashboardItemDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.dashboard;
+package org.fairdatapoint.api.dto.dashboard;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipDTO;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatapoint.entity.metadata.MetadataState;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/error/ErrorDTO.java b/src/main/java/org/fairdatapoint/api/dto/error/ErrorDTO.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/error/ErrorDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/error/ErrorDTO.java
index 131acf08f..b5a14fa83 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/error/ErrorDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/error/ErrorDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.error;
+package org.fairdatapoint.api.dto.error;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java b/src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
index f536a7047..cbc18f064 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteItemDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.form;
+package org.fairdatapoint.api.dto.form;
 
 import lombok.*;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java b/src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
index 5a208b54f..4eaaded5b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.form;
+package org.fairdatapoint.api.dto.form;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
index 8f3dc6cf2..e6b2f4d99 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.entry;
+package org.fairdatapoint.api.dto.index.entry;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
 import org.hibernate.validator.constraints.URL;
 
 import java.util.UUID;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
similarity index 87%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
index 2b65e23b1..75ba1a786 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.entry;
+package org.fairdatapoint.api.dto.index.entry;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.api.dto.index.event.EventDTO;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
-import nl.dtls.fairdatapoint.entity.index.entry.RepositoryMetadata;
+import org.fairdatapoint.api.dto.index.event.EventDTO;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.fairdatapoint.entity.index.entry.RepositoryMetadata;
 import org.hibernate.validator.constraints.URL;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
index 0799270ef..6d6681738 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryInfoDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.entry;
+package org.fairdatapoint.api.dto.index.entry;
 
 import lombok.*;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
index 6890aea46..bc5618158 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryStateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.entry;
+package org.fairdatapoint.api.dto.index.entry;
 
 public enum IndexEntryStateDTO {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java
index 8543a302c..d64d89d62 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/entry/IndexEntryUpdateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.entry;
+package org.fairdatapoint.api.dto.index.entry;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/event/EventDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/event/EventDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/event/EventDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/event/EventDTO.java
index 718b44f60..ad9c2490b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/event/EventDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/event/EventDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.event;
+package org.fairdatapoint.api.dto.index.event;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEventType;
+import org.fairdatapoint.entity.index.event.IndexEventType;
 
 import java.util.UUID;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/ping/PingDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/ping/PingDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/ping/PingDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/ping/PingDTO.java
index 229c776fd..bd70d7048 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/ping/PingDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/ping/PingDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.ping;
+package org.fairdatapoint.api.dto.index.ping;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
index db47118f8..99f343ddb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.settings;
+package org.fairdatapoint.api.dto.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
index 23224c0bc..f6d03b0c6 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.settings;
+package org.fairdatapoint.api.dto.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.api.validator.ValidDuration;
+import org.fairdatapoint.api.validator.ValidDuration;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
index cc6bc6b16..60325dedc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.settings;
+package org.fairdatapoint.api.dto.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.api.validator.ValidDuration;
+import org.fairdatapoint.api.validator.ValidDuration;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
index cce001e42..292479e19 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.settings;
+package org.fairdatapoint.api.dto.index.settings;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java b/src/main/java/org/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
index 531ea5d75..9c8b25752 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/index/webhook/WebhookPayloadDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.index.webhook;
+package org.fairdatapoint.api.dto.index.webhook;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
+import org.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/label/LabelDTO.java b/src/main/java/org/fairdatapoint/api/dto/label/LabelDTO.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/label/LabelDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/label/LabelDTO.java
index 58290dc1a..b66ef9f42 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/label/LabelDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/label/LabelDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.label;
+package org.fairdatapoint.api.dto.label;
 
 import lombok.*;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberCreateDTO.java b/src/main/java/org/fairdatapoint/api/dto/member/MemberCreateDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberCreateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/member/MemberCreateDTO.java
index ff263e964..4dd101011 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberCreateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/member/MemberCreateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.member;
+package org.fairdatapoint.api.dto.member;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberDTO.java b/src/main/java/org/fairdatapoint/api/dto/member/MemberDTO.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/member/MemberDTO.java
index ad6c3b449..d68e8056f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/member/MemberDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.member;
+package org.fairdatapoint.api.dto.member;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserSimpleDTO;
+import org.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatapoint.api.dto.user.UserSimpleDTO;
 
 @Data
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/membership/MembershipDTO.java b/src/main/java/org/fairdatapoint/api/dto/membership/MembershipDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/membership/MembershipDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/membership/MembershipDTO.java
index 60dfe160a..44cc4e675 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/membership/MembershipDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/membership/MembershipDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.membership;
+package org.fairdatapoint.api.dto.membership;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java b/src/main/java/org/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
index 962008cbd..8d377e506 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/membership/MembershipPermissionDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.membership;
+package org.fairdatapoint.api.dto.membership;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaDTO.java b/src/main/java/org/fairdatapoint/api/dto/metadata/MetaDTO.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/metadata/MetaDTO.java
index b04e97e43..d20f960a4 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/metadata/MetaDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.metadata;
+package org.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 nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatapoint.api.dto.member.MemberDTO;
 
 import java.util.Map;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaPathDTO.java b/src/main/java/org/fairdatapoint/api/dto/metadata/MetaPathDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaPathDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/metadata/MetaPathDTO.java
index 63e401f96..5e281639d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaPathDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/metadata/MetaPathDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.metadata;
+package org.fairdatapoint.api.dto.metadata;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java b/src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
index f2f3a8c71..ff7c756fc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateChangeDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.metadata;
+package org.fairdatapoint.api.dto.metadata;
 
 import lombok.*;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.entity.metadata.MetadataState;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaStateDTO.java b/src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateDTO.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaStateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateDTO.java
index 3c978717b..d215e3c90 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaStateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/metadata/MetaStateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.metadata;
+package org.fairdatapoint.api.dto.metadata;
 
 import lombok.*;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.entity.metadata.MetadataState;
 
 import java.util.Map;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/reset/ResetDTO.java b/src/main/java/org/fairdatapoint/api/dto/reset/ResetDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/reset/ResetDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/reset/ResetDTO.java
index 136e88342..cfae975ee 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/reset/ResetDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/reset/ResetDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.reset;
+package org.fairdatapoint.api.dto.reset;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
index 083b16b4c..a829af5ce 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.resource;
+package org.fairdatapoint.api.dto.resource;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildDTO.java b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildDTO.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildDTO.java
index fd052204a..30f83ac0a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.resource;
+package org.fairdatapoint.api.dto.resource;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -28,7 +28,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.api.validator.ValidIri;
 
 import java.util.UUID;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewDTO.java b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewDTO.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewDTO.java
index c15ad0d50..017bafbf3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.resource;
+package org.fairdatapoint.api.dto.resource;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -28,7 +28,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.api.validator.ValidIri;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewMetadataDTO.java b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewMetadataDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewMetadataDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewMetadataDTO.java
index e3189655c..596747b36 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewMetadataDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildListViewMetadataDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.resource;
+package org.fairdatapoint.api.dto.resource;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.api.validator.ValidIri;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
index 2f1480832..17bc3e853 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.resource;
+package org.fairdatapoint.api.dto.resource;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionLinkDTO.java b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionLinkDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionLinkDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionLinkDTO.java
index e107d529d..01f54923d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionLinkDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionLinkDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.resource;
+package org.fairdatapoint.api.dto.resource;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.api.validator.ValidIri;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
index fa91645b6..ed7c3a9d9 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
index 6c99b6767..e5b120e87 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
index 4812e4f85..48c954f33 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
index 7dfc039d5..a7f185da8 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
index 9d69293e3..172b76d99 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.api.validator.ValidSemVer;
+import org.fairdatapoint.api.validator.ValidSemVer;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
index bd8216e3f..578d871b7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
index b4aca75a4..0adc561b4 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaRemoteState.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 public enum MetadataSchemaRemoteState {
     DIRTY, CONFLICT, ALREADY_IMPORTED, NOT_IMPORTED
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
index fdc0d4b1c..9b30c9e4c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
index 6e4b81739..8e45fb78d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.schema;
+package org.fairdatapoint.api.dto.schema;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaType;
+import org.fairdatapoint.entity.schema.MetadataSchemaType;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterDTO.java b/src/main/java/org/fairdatapoint/api/dto/search/SearchFilterDTO.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/search/SearchFilterDTO.java
index 94b7c38ac..8f46ed187 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/search/SearchFilterDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.search;
+package org.fairdatapoint.api.dto.search;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterType;
+import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.entity.search.SearchFilterType;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterItemDTO.java b/src/main/java/org/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
index 3c8a377d0..de321e495 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/search/SearchFilterItemDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.search;
+package org.fairdatapoint.api.dto.search;
 
 import lombok.*;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryDTO.java b/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/search/SearchQueryDTO.java
index 14eabf5b0..f6297abe3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.search;
+package org.fairdatapoint.api.dto.search;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java b/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
index 2df5edbee..02a53a185 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.search;
+package org.fairdatapoint.api.dto.search;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java b/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
index 0f6b76af8..64b26cb11 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.search;
+package org.fairdatapoint.api.dto.search;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchResultDTO.java b/src/main/java/org/fairdatapoint/api/dto/search/SearchResultDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchResultDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/search/SearchResultDTO.java
index 54b13ddb9..1b067f4ff 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchResultDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/search/SearchResultDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.search;
+package org.fairdatapoint.api.dto.search;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.entity.search.SearchResultRelation;
+import org.fairdatapoint.entity.search.SearchResultRelation;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java b/src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
index c9a215e47..6bbdab9a6 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.search;
+package org.fairdatapoint.api.dto.search;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.fairdatapoint.entity.search.SearchSavedQueryType;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java b/src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
index 0d4928838..12693360d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.search;
+package org.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 nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatapoint.entity.search.SearchSavedQueryType;
 
 import java.time.Instant;
 import java.util.UUID;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
index 474260865..048b862af 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.api.validator.ValidIri;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsDTO.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsDTO.java
index e8d10b073..e3e47c5f0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
index b7482e700..ba41f223c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
index 862d6906f..b9189600a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsFormsDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsMetricDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsMetricDTO.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsMetricDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsMetricDTO.java
index e37c61480..5057acaab 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsMetricDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsMetricDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingDTO.java
index 3efef6521..30b6d8b06 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
index 99243c1ea..96bbf7d5e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
index 2ae1504e8..6d878beaf 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsRepositoryDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import lombok.*;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsSearchDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
index 8e4ef041f..2b4112898 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsSearchDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import nl.dtls.fairdatapoint.api.dto.search.SearchFilterDTO;
+import org.fairdatapoint.api.dto.search.SearchFilterDTO;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
index e14675a89..5f1b54df6 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.settings;
+package org.fairdatapoint.api.dto.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserChangeDTO.java b/src/main/java/org/fairdatapoint/api/dto/user/UserChangeDTO.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserChangeDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/user/UserChangeDTO.java
index 838f878ef..dffcae4d4 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserChangeDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/user/UserChangeDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.user;
+package org.fairdatapoint.api.dto.user;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
+import org.fairdatapoint.entity.user.UserRole;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserCreateDTO.java b/src/main/java/org/fairdatapoint/api/dto/user/UserCreateDTO.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserCreateDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/user/UserCreateDTO.java
index 610d7d428..ad1e4e53f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserCreateDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/user/UserCreateDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.user;
+package org.fairdatapoint.api.dto.user;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
+import org.fairdatapoint.entity.user.UserRole;
 
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserDTO.java b/src/main/java/org/fairdatapoint/api/dto/user/UserDTO.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/user/UserDTO.java
index 5fa423b72..aa7ef7c8c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/user/UserDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.user;
+package org.fairdatapoint.api.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
+import org.fairdatapoint.entity.user.UserRole;
 
 import java.util.UUID;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserPasswordDTO.java b/src/main/java/org/fairdatapoint/api/dto/user/UserPasswordDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserPasswordDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/user/UserPasswordDTO.java
index d737660ea..b3bac669c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserPasswordDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/user/UserPasswordDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.user;
+package org.fairdatapoint.api.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserProfileChangeDTO.java b/src/main/java/org/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
index a0b324e2d..f33647523 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/user/UserProfileChangeDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.user;
+package org.fairdatapoint.api.dto.user;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserSimpleDTO.java b/src/main/java/org/fairdatapoint/api/dto/user/UserSimpleDTO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserSimpleDTO.java
rename to src/main/java/org/fairdatapoint/api/dto/user/UserSimpleDTO.java
index 88ae23c31..abb926da0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserSimpleDTO.java
+++ b/src/main/java/org/fairdatapoint/api/dto/user/UserSimpleDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.dto.user;
+package org.fairdatapoint.api.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/filter/CORSFilter.java b/src/main/java/org/fairdatapoint/api/filter/CORSFilter.java
similarity index 97%
rename from src/main/java/nl/dtls/fairdatapoint/api/filter/CORSFilter.java
rename to src/main/java/org/fairdatapoint/api/filter/CORSFilter.java
index 78c770b35..32316ae4c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/filter/CORSFilter.java
+++ b/src/main/java/org/fairdatapoint/api/filter/CORSFilter.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.api.filter;
+package org.fairdatapoint.api.filter;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/filter/FilterConfigurer.java b/src/main/java/org/fairdatapoint/api/filter/FilterConfigurer.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/api/filter/FilterConfigurer.java
rename to src/main/java/org/fairdatapoint/api/filter/FilterConfigurer.java
index 22cb74f82..a82865894 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/filter/FilterConfigurer.java
+++ b/src/main/java/org/fairdatapoint/api/filter/FilterConfigurer.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.filter;
+package org.fairdatapoint.api.filter;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/filter/JwtTokenFilter.java b/src/main/java/org/fairdatapoint/api/filter/JwtTokenFilter.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/api/filter/JwtTokenFilter.java
rename to src/main/java/org/fairdatapoint/api/filter/JwtTokenFilter.java
index a36fa7739..520ddbd8e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/filter/JwtTokenFilter.java
+++ b/src/main/java/org/fairdatapoint/api/filter/JwtTokenFilter.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.filter;
+package org.fairdatapoint.api.filter;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.FilterChain;
@@ -28,10 +28,10 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.entity.exception.UnauthorizedException;
-import nl.dtls.fairdatapoint.service.apikey.ApiKeyService;
-import nl.dtls.fairdatapoint.service.jwt.JwtService;
+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.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.Authentication;
@@ -41,7 +41,7 @@
 
 import java.io.IOException;
 
-import static nl.dtls.fairdatapoint.util.HttpUtil.getToken;
+import static org.fairdatapoint.util.HttpUtil.getToken;
 
 @Component
 @RequiredArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/filter/LoggingFilter.java b/src/main/java/org/fairdatapoint/api/filter/LoggingFilter.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/filter/LoggingFilter.java
rename to src/main/java/org/fairdatapoint/api/filter/LoggingFilter.java
index 3bbbcbbc4..eaf156ac7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/filter/LoggingFilter.java
+++ b/src/main/java/org/fairdatapoint/api/filter/LoggingFilter.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +25,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.api.filter;
+package org.fairdatapoint.api.filter;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.service.UtilityService;
+import org.fairdatapoint.service.UtilityService;
 import org.apache.logging.log4j.ThreadContext;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/DurationValidator.java b/src/main/java/org/fairdatapoint/api/validator/DurationValidator.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/validator/DurationValidator.java
rename to src/main/java/org/fairdatapoint/api/validator/DurationValidator.java
index 888707fbb..b1bbff080 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/validator/DurationValidator.java
+++ b/src/main/java/org/fairdatapoint/api/validator/DurationValidator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.validator;
+package org.fairdatapoint.api.validator;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/IriValidator.java b/src/main/java/org/fairdatapoint/api/validator/IriValidator.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/api/validator/IriValidator.java
rename to src/main/java/org/fairdatapoint/api/validator/IriValidator.java
index 0b0dcb461..a4738fbb1 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/validator/IriValidator.java
+++ b/src/main/java/org/fairdatapoint/api/validator/IriValidator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.validator;
+package org.fairdatapoint.api.validator;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 public class IriValidator implements ConstraintValidator<ValidIri, String> {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/SemVerValidator.java b/src/main/java/org/fairdatapoint/api/validator/SemVerValidator.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/api/validator/SemVerValidator.java
rename to src/main/java/org/fairdatapoint/api/validator/SemVerValidator.java
index f43da0e80..c6d05680d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/validator/SemVerValidator.java
+++ b/src/main/java/org/fairdatapoint/api/validator/SemVerValidator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.validator;
+package org.fairdatapoint.api.validator;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
-import nl.dtls.fairdatapoint.entity.schema.SemVer;
+import org.fairdatapoint.entity.schema.SemVer;
 
 public class SemVerValidator implements ConstraintValidator<ValidSemVer, String> {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidDuration.java b/src/main/java/org/fairdatapoint/api/validator/ValidDuration.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/validator/ValidDuration.java
rename to src/main/java/org/fairdatapoint/api/validator/ValidDuration.java
index a419febb9..b0cc1dd1e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidDuration.java
+++ b/src/main/java/org/fairdatapoint/api/validator/ValidDuration.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.validator;
+package org.fairdatapoint.api.validator;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidIri.java b/src/main/java/org/fairdatapoint/api/validator/ValidIri.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/api/validator/ValidIri.java
rename to src/main/java/org/fairdatapoint/api/validator/ValidIri.java
index 6a546a64f..72832f0f8 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidIri.java
+++ b/src/main/java/org/fairdatapoint/api/validator/ValidIri.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.validator;
+package org.fairdatapoint.api.validator;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidSemVer.java b/src/main/java/org/fairdatapoint/api/validator/ValidSemVer.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/api/validator/ValidSemVer.java
rename to src/main/java/org/fairdatapoint/api/validator/ValidSemVer.java
index 3ebe9cd84..47718fc0b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidSemVer.java
+++ b/src/main/java/org/fairdatapoint/api/validator/ValidSemVer.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.validator;
+package org.fairdatapoint.api.validator;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/AclConfig.java b/src/main/java/org/fairdatapoint/config/AclConfig.java
similarity index 98%
rename from src/main/java/nl/dtls/fairdatapoint/config/AclConfig.java
rename to src/main/java/org/fairdatapoint/config/AclConfig.java
index 61f2ed39d..129c46b26 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/AclConfig.java
+++ b/src/main/java/org/fairdatapoint/config/AclConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
+import org.fairdatapoint.entity.user.UserRole;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/AclMethodSecurityConfiguration.java b/src/main/java/org/fairdatapoint/config/AclMethodSecurityConfiguration.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/config/AclMethodSecurityConfiguration.java
rename to src/main/java/org/fairdatapoint/config/AclMethodSecurityConfiguration.java
index aba641203..9b15342a3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/AclMethodSecurityConfiguration.java
+++ b/src/main/java/org/fairdatapoint/config/AclMethodSecurityConfiguration.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/AsyncConfig.java b/src/main/java/org/fairdatapoint/config/AsyncConfig.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/config/AsyncConfig.java
rename to src/main/java/org/fairdatapoint/config/AsyncConfig.java
index 716504dcc..9af3f6741 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/AsyncConfig.java
+++ b/src/main/java/org/fairdatapoint/config/AsyncConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
-import nl.dtls.fairdatapoint.Profiles;
+import org.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/nl/dtls/fairdatapoint/config/CacheConfig.java b/src/main/java/org/fairdatapoint/config/CacheConfig.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/config/CacheConfig.java
rename to src/main/java/org/fairdatapoint/config/CacheConfig.java
index f57c8892d..631752a5d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/CacheConfig.java
+++ b/src/main/java/org/fairdatapoint/config/CacheConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
@@ -29,7 +29,7 @@
 
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.config.AclConfig.ACL_CACHE;
+import static org.fairdatapoint.config.AclConfig.ACL_CACHE;
 
 @Configuration
 @EnableCaching
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/ConverterConfig.java b/src/main/java/org/fairdatapoint/config/ConverterConfig.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/config/ConverterConfig.java
rename to src/main/java/org/fairdatapoint/config/ConverterConfig.java
index d92e1eb0f..e46725f6a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/ConverterConfig.java
+++ b/src/main/java/org/fairdatapoint/config/ConverterConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +25,10 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
-import nl.dtls.fairdatapoint.api.converter.ErrorConverter;
-import nl.dtls.fairdatapoint.api.converter.RdfConverter;
+import org.fairdatapoint.api.converter.ErrorConverter;
+import org.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/nl/dtls/fairdatapoint/config/DatabaseConfig.java b/src/main/java/org/fairdatapoint/config/DatabaseConfig.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/config/DatabaseConfig.java
rename to src/main/java/org/fairdatapoint/config/DatabaseConfig.java
index 8d7866855..b22509f92 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/DatabaseConfig.java
+++ b/src/main/java/org/fairdatapoint/config/DatabaseConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.Profiles;
+import org.fairdatapoint.Profiles;
 import org.flywaydb.core.Flyway;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/HttpClientConfig.java b/src/main/java/org/fairdatapoint/config/HttpClientConfig.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/config/HttpClientConfig.java
rename to src/main/java/org/fairdatapoint/config/HttpClientConfig.java
index 5477e6351..577e23568 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/HttpClientConfig.java
+++ b/src/main/java/org/fairdatapoint/config/HttpClientConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/MetadataConfig.java b/src/main/java/org/fairdatapoint/config/MetadataConfig.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/config/MetadataConfig.java
rename to src/main/java/org/fairdatapoint/config/MetadataConfig.java
index 648941329..cf0cb1a92 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/MetadataConfig.java
+++ b/src/main/java/org/fairdatapoint/config/MetadataConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
-import nl.dtls.fairdatapoint.config.properties.InstanceProperties;
+import org.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 nl.dtls.fairdatapoint.util.HttpUtil.removeLastSlash;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.HttpUtil.removeLastSlash;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Configuration
 public class MetadataConfig {
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/OpenApiConfig.java b/src/main/java/org/fairdatapoint/config/OpenApiConfig.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/config/OpenApiConfig.java
rename to src/main/java/org/fairdatapoint/config/OpenApiConfig.java
index 4f8aead41..a69659f89 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/OpenApiConfig.java
+++ b/src/main/java/org/fairdatapoint/config/OpenApiConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.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 nl.dtls.fairdatapoint.config.properties.InstanceProperties;
-import nl.dtls.fairdatapoint.config.properties.OpenApiProperties;
-import nl.dtls.fairdatapoint.service.openapi.OpenApiTagsUtils;
+import org.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatapoint.config.properties.OpenApiProperties;
+import org.fairdatapoint.service.openapi.OpenApiTagsUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/PasswordConfig.java b/src/main/java/org/fairdatapoint/config/PasswordConfig.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/config/PasswordConfig.java
rename to src/main/java/org/fairdatapoint/config/PasswordConfig.java
index c01570fd6..f9326c485 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/PasswordConfig.java
+++ b/src/main/java/org/fairdatapoint/config/PasswordConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/PropertyConfig.java b/src/main/java/org/fairdatapoint/config/PropertyConfig.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/config/PropertyConfig.java
rename to src/main/java/org/fairdatapoint/config/PropertyConfig.java
index 7354a8d3a..9cb71bd2e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/PropertyConfig.java
+++ b/src/main/java/org/fairdatapoint/config/PropertyConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/RepositoryConfig.java b/src/main/java/org/fairdatapoint/config/RepositoryConfig.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/config/RepositoryConfig.java
rename to src/main/java/org/fairdatapoint/config/RepositoryConfig.java
index 831643aa0..c71a496c1 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/RepositoryConfig.java
+++ b/src/main/java/org/fairdatapoint/config/RepositoryConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.config.properties.RepositoryConnectionProperties;
-import nl.dtls.fairdatapoint.config.properties.RepositoryProperties;
+import org.fairdatapoint.config.properties.RepositoryConnectionProperties;
+import org.fairdatapoint.config.properties.RepositoryProperties;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.repository.config.RepositoryConfigException;
@@ -43,7 +43,7 @@
 
 import java.io.File;
 
-import static nl.dtls.fairdatapoint.util.HttpUtil.removeLastSlash;
+import static org.fairdatapoint.util.HttpUtil.removeLastSlash;
 
 @Slf4j
 @Configuration
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/RepositoryMigrationConfig.java b/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/config/RepositoryMigrationConfig.java
rename to src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
index 343280746..b1863fa3b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/RepositoryMigrationConfig.java
+++ b/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
-import nl.dtls.fairdatapoint.Profiles;
+import org.fairdatapoint.Profiles;
 import nl.dtls.rdf.migration.database.RdfMigrationRepository;
 import nl.dtls.rdf.migration.runner.RdfProductionMigrationRunner;
 import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/SecurityConfig.java b/src/main/java/org/fairdatapoint/config/SecurityConfig.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/config/SecurityConfig.java
rename to src/main/java/org/fairdatapoint/config/SecurityConfig.java
index c4521db9e..76077046f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/SecurityConfig.java
+++ b/src/main/java/org/fairdatapoint/config/SecurityConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
-import nl.dtls.fairdatapoint.api.filter.FilterConfigurer;
+import org.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/nl/dtls/fairdatapoint/config/WebConfig.java b/src/main/java/org/fairdatapoint/config/WebConfig.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/config/WebConfig.java
rename to src/main/java/org/fairdatapoint/config/WebConfig.java
index ba3801bc3..1dfce17ee 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/WebConfig.java
+++ b/src/main/java/org/fairdatapoint/config/WebConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import nl.dtls.fairdatapoint.api.converter.ErrorConverter;
-import nl.dtls.fairdatapoint.api.converter.RdfConverter;
+import org.fairdatapoint.api.converter.ErrorConverter;
+import org.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/nl/dtls/fairdatapoint/config/WorkerConfig.java b/src/main/java/org/fairdatapoint/config/WorkerConfig.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/config/WorkerConfig.java
rename to src/main/java/org/fairdatapoint/config/WorkerConfig.java
index b03032b46..55491af71 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/WorkerConfig.java
+++ b/src/main/java/org/fairdatapoint/config/WorkerConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/properties/InstanceProperties.java b/src/main/java/org/fairdatapoint/config/properties/InstanceProperties.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/config/properties/InstanceProperties.java
rename to src/main/java/org/fairdatapoint/config/properties/InstanceProperties.java
index 90fb4ae58..c06a2035b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/properties/InstanceProperties.java
+++ b/src/main/java/org/fairdatapoint/config/properties/InstanceProperties.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config.properties;
+package org.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/properties/OpenApiContactProperties.java b/src/main/java/org/fairdatapoint/config/properties/OpenApiContactProperties.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/config/properties/OpenApiContactProperties.java
rename to src/main/java/org/fairdatapoint/config/properties/OpenApiContactProperties.java
index f289ddab6..db7191270 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/properties/OpenApiContactProperties.java
+++ b/src/main/java/org/fairdatapoint/config/properties/OpenApiContactProperties.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config.properties;
+package org.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/properties/OpenApiProperties.java b/src/main/java/org/fairdatapoint/config/properties/OpenApiProperties.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/config/properties/OpenApiProperties.java
rename to src/main/java/org/fairdatapoint/config/properties/OpenApiProperties.java
index 1cc5d10ce..64d6a111a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/properties/OpenApiProperties.java
+++ b/src/main/java/org/fairdatapoint/config/properties/OpenApiProperties.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config.properties;
+package org.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/properties/PingProperties.java b/src/main/java/org/fairdatapoint/config/properties/PingProperties.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/config/properties/PingProperties.java
rename to src/main/java/org/fairdatapoint/config/properties/PingProperties.java
index 75e7cc87e..8efdcbfcc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/properties/PingProperties.java
+++ b/src/main/java/org/fairdatapoint/config/properties/PingProperties.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config.properties;
+package org.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryBasicProperties.java b/src/main/java/org/fairdatapoint/config/properties/RepositoryBasicProperties.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryBasicProperties.java
rename to src/main/java/org/fairdatapoint/config/properties/RepositoryBasicProperties.java
index 15481d3ae..242fcab35 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryBasicProperties.java
+++ b/src/main/java/org/fairdatapoint/config/properties/RepositoryBasicProperties.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config.properties;
+package org.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryConnectionProperties.java b/src/main/java/org/fairdatapoint/config/properties/RepositoryConnectionProperties.java
similarity index 97%
rename from src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryConnectionProperties.java
rename to src/main/java/org/fairdatapoint/config/properties/RepositoryConnectionProperties.java
index 46700ee86..6b4917abc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryConnectionProperties.java
+++ b/src/main/java/org/fairdatapoint/config/properties/RepositoryConnectionProperties.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config.properties;
+package org.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryNativeProperties.java b/src/main/java/org/fairdatapoint/config/properties/RepositoryNativeProperties.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryNativeProperties.java
rename to src/main/java/org/fairdatapoint/config/properties/RepositoryNativeProperties.java
index c825379bd..84958cb2e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryNativeProperties.java
+++ b/src/main/java/org/fairdatapoint/config/properties/RepositoryNativeProperties.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config.properties;
+package org.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryProperties.java b/src/main/java/org/fairdatapoint/config/properties/RepositoryProperties.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryProperties.java
rename to src/main/java/org/fairdatapoint/config/properties/RepositoryProperties.java
index 5256f0a6b..93d16061c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/config/properties/RepositoryProperties.java
+++ b/src/main/java/org/fairdatapoint/config/properties/RepositoryProperties.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config.properties;
+package org.fairdatapoint.config.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/common/migration/Migration.java b/src/main/java/org/fairdatapoint/database/common/migration/Migration.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/database/common/migration/Migration.java
rename to src/main/java/org/fairdatapoint/database/common/migration/Migration.java
index f88a946cb..f98dbe1db 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/common/migration/Migration.java
+++ b/src/main/java/org/fairdatapoint/database/common/migration/Migration.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.common.migration;
+package org.fairdatapoint.database.common.migration;
 
 public interface Migration {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ApiKeyRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/ApiKeyRepository.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/ApiKeyRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/ApiKeyRepository.java
index 218c4beb9..928e6aba8 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ApiKeyRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/ApiKeyRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.apikey.ApiKey;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexEntryRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/IndexEntryRepository.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexEntryRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/IndexEntryRepository.java
index b288c5384..97704d943 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexEntryRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/IndexEntryRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryState;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.fairdatapoint.entity.index.entry.IndexEntryState;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexEventRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/IndexEventRepository.java
similarity index 83%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexEventRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/IndexEventRepository.java
index 67f006f25..67f7fa684 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexEventRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/IndexEventRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEventType;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.entity.index.event.IndexEventType;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexSettingsRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/IndexSettingsRepository.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexSettingsRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/IndexSettingsRepository.java
index e746771fe..03769a066 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexSettingsRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/IndexSettingsRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.index.settings.IndexSettings;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexWebhookRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/IndexWebhookRepository.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexWebhookRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/IndexWebhookRepository.java
index bdca026f7..ef9fe9e6c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/IndexWebhookRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/IndexWebhookRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhook;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.index.webhook.IndexWebhook;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MembershipPermissionRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/MembershipPermissionRepository.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/MembershipPermissionRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/MembershipPermissionRepository.java
index 260e187d3..9cc00aef1 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MembershipPermissionRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/MembershipPermissionRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.membership.MembershipPermission;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.membership.MembershipPermission;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MembershipRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/MembershipRepository.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/MembershipRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/MembershipRepository.java
index d702ab6e4..59c299fe9 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MembershipRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/MembershipRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.membership.Membership;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaExtensionRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaExtensionRepository.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaExtensionRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaExtensionRepository.java
index caceab19d..be300bf63 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaExtensionRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaExtensionRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaExtension;
+import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.entity.schema.MetadataSchemaExtension;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaRepository.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaRepository.java
index 8b77ed7e2..74d96f173 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.schema.MetadataSchema;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaUsageRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaUsageRepository.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaUsageRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaUsageRepository.java
index 4d2cc9a36..527566f80 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaUsageRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaUsageRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.entity.resource.MetadataSchemaUsage;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.entity.resource.MetadataSchemaUsage;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaVersionRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaVersionRepository.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaVersionRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaVersionRepository.java
index 53da389f5..2abb54e41 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/MetadataSchemaVersionRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/MetadataSchemaVersionRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaState;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaState;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionChildMetadataRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionChildMetadataRepository.java
similarity index 83%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionChildMetadataRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionChildMetadataRepository.java
index af470ed6f..c83f4df31 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionChildMetadataRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionChildMetadataRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChildMetadata;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinitionChildMetadata;
 
 public interface ResourceDefinitionChildMetadataRepository extends BaseRepository<ResourceDefinitionChildMetadata> {
 }
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionChildRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionChildRepository.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionChildRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionChildRepository.java
index 96bcd7fe9..9763673c9 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionChildRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionChildRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionLinkRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionLinkRepository.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionLinkRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionLinkRepository.java
index 009d31620..15ef03c53 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionLinkRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionLinkRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionLink;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinitionLink;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionRepository.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionRepository.java
index fbf385abb..9d1465094 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/ResourceDefinitionRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/ResourceDefinitionRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SearchSavedQueryRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/SearchSavedQueryRepository.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/SearchSavedQueryRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/SearchSavedQueryRepository.java
index 19ff9efc1..7cfe307ca 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SearchSavedQueryRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/SearchSavedQueryRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.search.SearchSavedQuery;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsAutocompleteSourceRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/SettingsAutocompleteSourceRepository.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsAutocompleteSourceRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/SettingsAutocompleteSourceRepository.java
index a8ee08130..ce230cf32 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsAutocompleteSourceRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/SettingsAutocompleteSourceRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.settings.SettingsAutocompleteSource;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.settings.SettingsAutocompleteSource;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsMetricRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/SettingsMetricRepository.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsMetricRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/SettingsMetricRepository.java
index c3e022ff1..9645f1fdb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsMetricRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/SettingsMetricRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.settings.SettingsMetric;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.settings.SettingsMetric;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/SettingsRepository.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/SettingsRepository.java
index 8575dbf35..1a8d7cbe5 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/SettingsRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.settings.Settings;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsSearchFilterItemRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/SettingsSearchFilterItemRepository.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsSearchFilterItemRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/SettingsSearchFilterItemRepository.java
index b22b6bb3b..a8326334a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsSearchFilterItemRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/SettingsSearchFilterItemRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.settings.SettingsSearchFilterItem;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.settings.SettingsSearchFilterItem;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsSearchFilterRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/SettingsSearchFilterRepository.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsSearchFilterRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/SettingsSearchFilterRepository.java
index f9dac2373..c6544c6cc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/SettingsSearchFilterRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/SettingsSearchFilterRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.settings.SettingsSearchFilter;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.settings.SettingsSearchFilter;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/UserAccountRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/UserAccountRepository.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/UserAccountRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/UserAccountRepository.java
index 98fc2e7d5..d8c6e2928 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/UserAccountRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/UserAccountRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository;
+package org.fairdatapoint.database.db.repository;
 
-import nl.dtls.fairdatapoint.database.db.repository.base.BaseRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.database.db.repository.base.BaseRepository;
+import org.fairdatapoint.entity.user.UserAccount;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/base/BaseRepository.java b/src/main/java/org/fairdatapoint/database/db/repository/base/BaseRepository.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/database/db/repository/base/BaseRepository.java
rename to src/main/java/org/fairdatapoint/database/db/repository/base/BaseRepository.java
index f821b4470..028ef583f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/db/repository/base/BaseRepository.java
+++ b/src/main/java/org/fairdatapoint/database/db/repository/base/BaseRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.db.repository.base;
+package org.fairdatapoint.database.db.repository.base;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/RdfDevelopmentMigrationRunner.java b/src/main/java/org/fairdatapoint/database/rdf/migration/RdfDevelopmentMigrationRunner.java
similarity index 80%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/RdfDevelopmentMigrationRunner.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/RdfDevelopmentMigrationRunner.java
index c6dcd7250..59c4aeb2c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/RdfDevelopmentMigrationRunner.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/RdfDevelopmentMigrationRunner.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration;
+package org.fairdatapoint.database.rdf.migration;
 
 import jakarta.annotation.PostConstruct;
-import nl.dtls.fairdatapoint.Profiles;
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.AclMigration;
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatapoint.Profiles;
+import org.fairdatapoint.database.rdf.migration.development.metadata.AclMigration;
+import org.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/AclMigration.java b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/AclMigration.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/AclMigration.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/AclMigration.java
index 789bdb1a8..ea20bd9a5 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/AclMigration.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/AclMigration.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.development.metadata;
+package org.fairdatapoint.database.rdf.migration.development.metadata;
 
-import nl.dtls.fairdatapoint.entity.metadata.Metadata;
-import nl.dtls.fairdatapoint.service.member.MemberService;
-import nl.dtls.fairdatapoint.service.security.AuthenticationService;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatapoint.service.member.MemberService;
+import org.fairdatapoint.service.security.AuthenticationService;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.acls.model.AclCache;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
similarity index 80%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
index 941c216e7..4a6d39946 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/RdfMetadataMigration.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,24 +20,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.development.metadata;
-
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.database.common.migration.Migration;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.metadata.state.MetadataStateService;
-import nl.dtls.fairdatapoint.service.security.AuthenticationService;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+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.entity.user.UserAccount;
+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.AuthenticationService;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,8 +46,8 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class RdfMetadataMigration implements Migration {
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
similarity index 97%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
index 40b66f0a7..4a088bf00 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/data/RdfMetadataFixtures.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.data;
+package org.fairdatapoint.database.rdf.migration.development.metadata.data;
 
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory;
+import org.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/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
index b6716949a..b7d3e613b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactory.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.factory;
+package org.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/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
index 2455b4894..16cf97f34 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/development/metadata/factory/MetadataFactoryImpl.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.factory;
+package org.fairdatapoint.database.rdf.migration.development.metadata.factory;
 
-import nl.dtls.fairdatapoint.entity.metadata.Agent;
-import nl.dtls.fairdatapoint.util.ValueFactoryHelper;
+import org.fairdatapoint.entity.metadata.Agent;
+import org.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 nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.l;
 
 @Service
 public class MetadataFactoryImpl implements MetadataFactory {
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
index 7233c2c25..54e190be7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.production;
+package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.service.reset.FactoryDefaults;
+import org.fairdatapoint.service.reset.FactoryDefaults;
 import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
 import nl.dtls.rdf.migration.runner.RdfProductionMigration;
 import org.bson.Document;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
index 289a823a0..ff5b08b04 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.production;
+package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
 import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
index c75d2b63d..e610a82ce 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.production;
+package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
 import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
index 71ef6d3eb..7c258d817 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.production;
+package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
 import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
rename to src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
index 9e1dd7700..77fb94593 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.migration.production;
+package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
 import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/RepositoryMode.java b/src/main/java/org/fairdatapoint/database/rdf/repository/RepositoryMode.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/RepositoryMode.java
rename to src/main/java/org/fairdatapoint/database/rdf/repository/RepositoryMode.java
index 9eb82a2d6..6deae3228 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/RepositoryMode.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/repository/RepositoryMode.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository;
+package org.fairdatapoint.database.rdf.repository;
 
 public enum RepositoryMode {
     MAIN,
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java b/src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
similarity index 80%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
rename to src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
index 5d0dfcf28..3c36e6f65 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.catalog;
+package org.fairdatapoint.database.rdf.repository.catalog;
 
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.common.MetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.common.MetadataRepository;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import org.eclipse.rdf4j.model.IRI;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java b/src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
rename to src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
index 0ad831ef0..b523903fc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.catalog;
+package org.fairdatapoint.database.rdf.repository.catalog;
 
 import jakarta.annotation.PostConstruct;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.repository.Repository;
 import org.springframework.cache.Cache;
@@ -35,8 +35,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static nl.dtls.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service("catalogMetadataRepository")
 public class CatalogMetadataRepositoryImpl extends AbstractMetadataRepository implements CatalogMetadataRepository {
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java b/src/main/java/org/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
rename to src/main/java/org/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
index 55e234df7..a80d4b3f2 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/repository/common/AbstractMetadataRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.common;
+package org.fairdatapoint.database.rdf.repository.common;
 
 import com.google.common.io.Resources;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterValue;
-import nl.dtls.fairdatapoint.entity.search.SearchResult;
-import nl.dtls.fairdatapoint.entity.search.SearchResultRelation;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+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.eclipse.rdf4j.model.*;
 import org.eclipse.rdf4j.query.BindingSet;
 import org.eclipse.rdf4j.query.TupleQuery;
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/common/MetadataRepository.java b/src/main/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
rename to src/main/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
index ba9af294b..43a9e6483 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +25,12 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.common;
+package org.fairdatapoint.database.rdf.repository.common;
 
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterValue;
-import nl.dtls.fairdatapoint.entity.search.SearchResult;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.entity.search.SearchFilterValue;
+import org.fairdatapoint.entity.search.SearchResult;
 import org.eclipse.rdf4j.model.*;
 import org.eclipse.rdf4j.query.BindingSet;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java b/src/main/java/org/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
rename to src/main/java/org/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
index ca19bf616..33df7786c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/repository/exception/MetadataRepositoryException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.exception;
+package org.fairdatapoint.database.rdf.repository.exception;
 
 public class MetadataRepositoryException extends Exception {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java b/src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
similarity index 87%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
rename to src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
index 7407e7fab..59f3f688d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepository.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.generic;
+package org.fairdatapoint.database.rdf.repository.generic;
 
-import nl.dtls.fairdatapoint.database.rdf.repository.common.MetadataRepository;
+import org.fairdatapoint.database.rdf.repository.common.MetadataRepository;
 
 public interface GenericMetadataRepository extends MetadataRepository {
 }
diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java b/src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
rename to src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
index 3684f7e2c..dc1a70240 100644
--- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryImpl.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,11 +25,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.generic;
+package org.fairdatapoint.database.rdf.repository.generic;
 
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import org.eclipse.rdf4j.model.*;
 import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 import org.eclipse.rdf4j.repository.Repository;
@@ -39,8 +39,8 @@
 
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getParent;
+import static org.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
+import static org.fairdatapoint.entity.metadata.MetadataGetter.getParent;
 
 @Service("genericMetadataRepository")
 public class GenericMetadataRepositoryImpl extends AbstractMetadataRepository implements GenericMetadataRepository {
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/apikey/ApiKey.java b/src/main/java/org/fairdatapoint/entity/apikey/ApiKey.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/entity/apikey/ApiKey.java
rename to src/main/java/org/fairdatapoint/entity/apikey/ApiKey.java
index d94864a0d..7adc07285 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/apikey/ApiKey.java
+++ b/src/main/java/org/fairdatapoint/entity/apikey/ApiKey.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.apikey;
+package org.fairdatapoint.entity.apikey;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.user.UserAccount;
 
 @Entity(name = "ApiKey")
 @Table(name = "api_key")
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/base/BaseEntity.java b/src/main/java/org/fairdatapoint/entity/base/BaseEntity.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/entity/base/BaseEntity.java
rename to src/main/java/org/fairdatapoint/entity/base/BaseEntity.java
index e3900dfd9..24fb116ca 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/base/BaseEntity.java
+++ b/src/main/java/org/fairdatapoint/entity/base/BaseEntity.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.base;
+package org.fairdatapoint.entity.base;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/base/BaseEntityCustomUUID.java b/src/main/java/org/fairdatapoint/entity/base/BaseEntityCustomUUID.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/entity/base/BaseEntityCustomUUID.java
rename to src/main/java/org/fairdatapoint/entity/base/BaseEntityCustomUUID.java
index bf4a9a5aa..620409ef9 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/base/BaseEntityCustomUUID.java
+++ b/src/main/java/org/fairdatapoint/entity/base/BaseEntityCustomUUID.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.base;
+package org.fairdatapoint.entity.base;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Id;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/exception/FeatureDisabledException.java b/src/main/java/org/fairdatapoint/entity/exception/FeatureDisabledException.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/exception/FeatureDisabledException.java
rename to src/main/java/org/fairdatapoint/entity/exception/FeatureDisabledException.java
index e8e678965..dd7f2e05a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/exception/FeatureDisabledException.java
+++ b/src/main/java/org/fairdatapoint/entity/exception/FeatureDisabledException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.exception;
+package org.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/exception/ForbiddenException.java b/src/main/java/org/fairdatapoint/entity/exception/ForbiddenException.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/exception/ForbiddenException.java
rename to src/main/java/org/fairdatapoint/entity/exception/ForbiddenException.java
index 7024c25c3..7d8502222 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/exception/ForbiddenException.java
+++ b/src/main/java/org/fairdatapoint/entity/exception/ForbiddenException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.exception;
+package org.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/exception/MetadataSchemaImportException.java b/src/main/java/org/fairdatapoint/entity/exception/MetadataSchemaImportException.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/exception/MetadataSchemaImportException.java
rename to src/main/java/org/fairdatapoint/entity/exception/MetadataSchemaImportException.java
index cccf7a8a2..a96d6b705 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/exception/MetadataSchemaImportException.java
+++ b/src/main/java/org/fairdatapoint/entity/exception/MetadataSchemaImportException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.exception;
+package org.fairdatapoint.entity.exception;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/exception/RdfValidationException.java b/src/main/java/org/fairdatapoint/entity/exception/RdfValidationException.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/exception/RdfValidationException.java
rename to src/main/java/org/fairdatapoint/entity/exception/RdfValidationException.java
index 82d2b4037..92142e7be 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/exception/RdfValidationException.java
+++ b/src/main/java/org/fairdatapoint/entity/exception/RdfValidationException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.exception;
+package org.fairdatapoint.entity.exception;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/exception/ResourceNotFoundException.java b/src/main/java/org/fairdatapoint/entity/exception/ResourceNotFoundException.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/exception/ResourceNotFoundException.java
rename to src/main/java/org/fairdatapoint/entity/exception/ResourceNotFoundException.java
index 8eb202940..ac4b5a136 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/exception/ResourceNotFoundException.java
+++ b/src/main/java/org/fairdatapoint/entity/exception/ResourceNotFoundException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.exception;
+package org.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/exception/UnauthorizedException.java b/src/main/java/org/fairdatapoint/entity/exception/UnauthorizedException.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/exception/UnauthorizedException.java
rename to src/main/java/org/fairdatapoint/entity/exception/UnauthorizedException.java
index 981af6f8f..7a967b5b7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/exception/UnauthorizedException.java
+++ b/src/main/java/org/fairdatapoint/entity/exception/UnauthorizedException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.exception;
+package org.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/exception/ValidationException.java b/src/main/java/org/fairdatapoint/entity/exception/ValidationException.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/exception/ValidationException.java
rename to src/main/java/org/fairdatapoint/entity/exception/ValidationException.java
index 304deba2f..756de74a7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/exception/ValidationException.java
+++ b/src/main/java/org/fairdatapoint/entity/exception/ValidationException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.exception;
+package org.fairdatapoint.entity.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/forms/RdfEntityCacheContainer.java b/src/main/java/org/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
rename to src/main/java/org/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
index a62e8f742..21e69b4ac 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
+++ b/src/main/java/org/fairdatapoint/entity/forms/RdfEntityCacheContainer.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.forms;
+package org.fairdatapoint.entity.forms;
 
 import lombok.*;
-import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
+import org.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/forms/RdfEntitySourceType.java b/src/main/java/org/fairdatapoint/entity/forms/RdfEntitySourceType.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/forms/RdfEntitySourceType.java
rename to src/main/java/org/fairdatapoint/entity/forms/RdfEntitySourceType.java
index 058fffb14..9129a194c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/forms/RdfEntitySourceType.java
+++ b/src/main/java/org/fairdatapoint/entity/forms/RdfEntitySourceType.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.forms;
+package org.fairdatapoint.entity.forms;
 
 public enum RdfEntitySourceType {
     SPARQL,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntry.java b/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntry.java
rename to src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
index 650046b0a..65c0189e9 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntry.java
+++ b/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.entry;
+package org.fairdatapoint.entity.index.entry;
 
 import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.base.BaseEntity;
 import org.hibernate.annotations.JdbcType;
 import org.hibernate.annotations.Type;
 import org.hibernate.dialect.PostgreSQLEnumJdbcType;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntryPermit.java b/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryPermit.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntryPermit.java
rename to src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryPermit.java
index c28a1c3c7..884d5152d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntryPermit.java
+++ b/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryPermit.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.entry;
+package org.fairdatapoint.entity.index.entry;
 
 public enum IndexEntryPermit {
     PENDING,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntryState.java b/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryState.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntryState.java
rename to src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryState.java
index 69f1c9fc5..2c739591b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/IndexEntryState.java
+++ b/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntryState.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.entry;
+package org.fairdatapoint.entity.index.entry;
 
 public enum IndexEntryState {
     UNKNOWN,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/RepositoryMetadata.java b/src/main/java/org/fairdatapoint/entity/index/entry/RepositoryMetadata.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/entry/RepositoryMetadata.java
rename to src/main/java/org/fairdatapoint/entity/index/entry/RepositoryMetadata.java
index 9ea6f92ca..9578de0fd 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/RepositoryMetadata.java
+++ b/src/main/java/org/fairdatapoint/entity/index/entry/RepositoryMetadata.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.entry;
+package org.fairdatapoint.entity.index.entry;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEvent.java b/src/main/java/org/fairdatapoint/entity/index/event/IndexEvent.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEvent.java
rename to src/main/java/org/fairdatapoint/entity/index/event/IndexEvent.java
index d369a6dd4..f06d1d289 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEvent.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/IndexEvent.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.event;
+package org.fairdatapoint.entity.index.event;
 
 import io.hypersistence.utils.hibernate.type.json.JsonType;
 import jakarta.persistence.*;
@@ -30,9 +30,9 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.event.payload.*;
+import org.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatapoint.entity.index.event.payload.*;
 import org.hibernate.annotations.JdbcType;
 import org.hibernate.annotations.Type;
 import org.hibernate.dialect.PostgreSQLEnumJdbcType;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEventPayload.java b/src/main/java/org/fairdatapoint/entity/index/event/IndexEventPayload.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEventPayload.java
rename to src/main/java/org/fairdatapoint/entity/index/event/IndexEventPayload.java
index 52d9be871..2cb535ef9 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEventPayload.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/IndexEventPayload.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.event;
+package org.fairdatapoint.entity.index.event;
 
 import lombok.Builder;
 import lombok.Data;
-import nl.dtls.fairdatapoint.entity.index.event.payload.*;
+import org.fairdatapoint.entity.index.event.payload.*;
 
 @Data
 @Builder
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEventType.java b/src/main/java/org/fairdatapoint/entity/index/event/IndexEventType.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEventType.java
rename to src/main/java/org/fairdatapoint/entity/index/event/IndexEventType.java
index 361d6a720..694e0baa0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/IndexEventType.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/IndexEventType.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.event;
+package org.fairdatapoint.entity.index.event;
 
 public enum IndexEventType {
     ADMIN_TRIGGER,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/AdminTrigger.java b/src/main/java/org/fairdatapoint/entity/index/event/payload/AdminTrigger.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/AdminTrigger.java
rename to src/main/java/org/fairdatapoint/entity/index/event/payload/AdminTrigger.java
index 0c35353c5..bb1378bf1 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/AdminTrigger.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/payload/AdminTrigger.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.event.payload;
+package org.fairdatapoint.entity.index.event.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/IncomingPing.java b/src/main/java/org/fairdatapoint/entity/index/event/payload/IncomingPing.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/IncomingPing.java
rename to src/main/java/org/fairdatapoint/entity/index/event/payload/IncomingPing.java
index 8c2b39bc5..7c5a69ae3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/IncomingPing.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/payload/IncomingPing.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.event.payload;
+package org.fairdatapoint.entity.index.event.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import nl.dtls.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatapoint.entity.index.http.Exchange;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/MetadataRetrieval.java b/src/main/java/org/fairdatapoint/entity/index/event/payload/MetadataRetrieval.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/MetadataRetrieval.java
rename to src/main/java/org/fairdatapoint/entity/index/event/payload/MetadataRetrieval.java
index 4130b1be2..bafc87e09 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/MetadataRetrieval.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/payload/MetadataRetrieval.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.event.payload;
+package org.fairdatapoint.entity.index.event.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import nl.dtls.fairdatapoint.entity.index.entry.RepositoryMetadata;
-import nl.dtls.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatapoint.entity.index.entry.RepositoryMetadata;
+import org.fairdatapoint.entity.index.http.Exchange;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/WebhookPing.java b/src/main/java/org/fairdatapoint/entity/index/event/payload/WebhookPing.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/WebhookPing.java
rename to src/main/java/org/fairdatapoint/entity/index/event/payload/WebhookPing.java
index a7eab1163..59ffcf707 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/WebhookPing.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/payload/WebhookPing.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.event.payload;
+package org.fairdatapoint.entity.index.event.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/WebhookTrigger.java b/src/main/java/org/fairdatapoint/entity/index/event/payload/WebhookTrigger.java
similarity index 83%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/WebhookTrigger.java
rename to src/main/java/org/fairdatapoint/entity/index/event/payload/WebhookTrigger.java
index 8bf93f9f3..37ce14a8c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/payload/WebhookTrigger.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/payload/WebhookTrigger.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.event.payload;
+package org.fairdatapoint.entity.index.event.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import nl.dtls.fairdatapoint.entity.index.http.Exchange;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhook;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
+import org.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatapoint.entity.index.webhook.IndexWebhook;
+import org.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
 
 @Data
 @NoArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/exception/AbstractIndexException.java b/src/main/java/org/fairdatapoint/entity/index/exception/AbstractIndexException.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/exception/AbstractIndexException.java
rename to src/main/java/org/fairdatapoint/entity/index/exception/AbstractIndexException.java
index d739f8fd5..358ff99fe 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/exception/AbstractIndexException.java
+++ b/src/main/java/org/fairdatapoint/entity/index/exception/AbstractIndexException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.exception;
+package org.fairdatapoint.entity.index.exception;
 
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatapoint.api.dto.error.ErrorDTO;
 import org.springframework.http.HttpStatus;
 
 public abstract class AbstractIndexException extends RuntimeException {
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java b/src/main/java/org/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
rename to src/main/java/org/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
index 37df98be9..c507377b4 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
+++ b/src/main/java/org/fairdatapoint/entity/index/exception/IncorrectPingFormatException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.exception;
+package org.fairdatapoint.entity.index.exception;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/exception/PingDeniedException.java b/src/main/java/org/fairdatapoint/entity/index/exception/PingDeniedException.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/exception/PingDeniedException.java
rename to src/main/java/org/fairdatapoint/entity/index/exception/PingDeniedException.java
index 37c241529..045fc5a96 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/exception/PingDeniedException.java
+++ b/src/main/java/org/fairdatapoint/entity/index/exception/PingDeniedException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.exception;
+package org.fairdatapoint.entity.index.exception;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/exception/RateLimitException.java b/src/main/java/org/fairdatapoint/entity/index/exception/RateLimitException.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/exception/RateLimitException.java
rename to src/main/java/org/fairdatapoint/entity/index/exception/RateLimitException.java
index 01eda9fcd..d32e1a1f0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/exception/RateLimitException.java
+++ b/src/main/java/org/fairdatapoint/entity/index/exception/RateLimitException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.exception;
+package org.fairdatapoint.entity.index.exception;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Exchange.java b/src/main/java/org/fairdatapoint/entity/index/http/Exchange.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/http/Exchange.java
rename to src/main/java/org/fairdatapoint/entity/index/http/Exchange.java
index a6505399a..4424f087a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Exchange.java
+++ b/src/main/java/org/fairdatapoint/entity/index/http/Exchange.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.http;
+package org.fairdatapoint.entity.index.http;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/ExchangeDirection.java b/src/main/java/org/fairdatapoint/entity/index/http/ExchangeDirection.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/http/ExchangeDirection.java
rename to src/main/java/org/fairdatapoint/entity/index/http/ExchangeDirection.java
index 14bebd589..2cee0e1ae 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/ExchangeDirection.java
+++ b/src/main/java/org/fairdatapoint/entity/index/http/ExchangeDirection.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.http;
+package org.fairdatapoint.entity.index.http;
 
 public enum ExchangeDirection {
     INCOMING,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/ExchangeState.java b/src/main/java/org/fairdatapoint/entity/index/http/ExchangeState.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/http/ExchangeState.java
rename to src/main/java/org/fairdatapoint/entity/index/http/ExchangeState.java
index 733c676e8..bdc674f9a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/ExchangeState.java
+++ b/src/main/java/org/fairdatapoint/entity/index/http/ExchangeState.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.http;
+package org.fairdatapoint.entity.index.http;
 
 public enum ExchangeState {
     Prepared,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Request.java b/src/main/java/org/fairdatapoint/entity/index/http/Request.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/http/Request.java
rename to src/main/java/org/fairdatapoint/entity/index/http/Request.java
index 16ce1cbcf..a4d8bbc65 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Request.java
+++ b/src/main/java/org/fairdatapoint/entity/index/http/Request.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.http;
+package org.fairdatapoint.entity.index.http;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Response.java b/src/main/java/org/fairdatapoint/entity/index/http/Response.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/http/Response.java
rename to src/main/java/org/fairdatapoint/entity/index/http/Response.java
index 719597c53..6eb95d31d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Response.java
+++ b/src/main/java/org/fairdatapoint/entity/index/http/Response.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.http;
+package org.fairdatapoint.entity.index.http;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettings.java b/src/main/java/org/fairdatapoint/entity/index/settings/IndexSettings.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettings.java
rename to src/main/java/org/fairdatapoint/entity/index/settings/IndexSettings.java
index a7481bddd..5ae6bc90d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettings.java
+++ b/src/main/java/org/fairdatapoint/entity/index/settings/IndexSettings.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.settings;
+package org.fairdatapoint.entity.index.settings;
 
 import io.hypersistence.utils.hibernate.type.array.ListArrayType;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntityCustomUUID;
+import org.fairdatapoint.entity.base.BaseEntityCustomUUID;
 import org.hibernate.annotations.Type;
 
 import java.time.Duration;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/SettingsIndexPing.java b/src/main/java/org/fairdatapoint/entity/index/settings/SettingsIndexPing.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/settings/SettingsIndexPing.java
rename to src/main/java/org/fairdatapoint/entity/index/settings/SettingsIndexPing.java
index af9171171..6d7002999 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/SettingsIndexPing.java
+++ b/src/main/java/org/fairdatapoint/entity/index/settings/SettingsIndexPing.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.settings;
+package org.fairdatapoint.entity.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/SettingsIndexRetrieval.java b/src/main/java/org/fairdatapoint/entity/index/settings/SettingsIndexRetrieval.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/settings/SettingsIndexRetrieval.java
rename to src/main/java/org/fairdatapoint/entity/index/settings/SettingsIndexRetrieval.java
index f3c9a37ea..e8642cecd 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/SettingsIndexRetrieval.java
+++ b/src/main/java/org/fairdatapoint/entity/index/settings/SettingsIndexRetrieval.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.settings;
+package org.fairdatapoint.entity.index.settings;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/IndexWebhook.java b/src/main/java/org/fairdatapoint/entity/index/webhook/IndexWebhook.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/IndexWebhook.java
rename to src/main/java/org/fairdatapoint/entity/index/webhook/IndexWebhook.java
index ad1d7c904..7d964b6c3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/IndexWebhook.java
+++ b/src/main/java/org/fairdatapoint/entity/index/webhook/IndexWebhook.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.webhook;
+package org.fairdatapoint.entity.index.webhook;
 
 import io.hypersistence.utils.hibernate.type.array.EnumArrayType;
 import io.hypersistence.utils.hibernate.type.array.ListArrayType;
@@ -33,7 +33,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.base.BaseEntity;
 import org.hibernate.annotations.Type;
 
 import java.util.ArrayList;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/IndexWebhookEvent.java b/src/main/java/org/fairdatapoint/entity/index/webhook/IndexWebhookEvent.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/IndexWebhookEvent.java
rename to src/main/java/org/fairdatapoint/entity/index/webhook/IndexWebhookEvent.java
index 208146fbf..5897ce70a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/IndexWebhookEvent.java
+++ b/src/main/java/org/fairdatapoint/entity/index/webhook/IndexWebhookEvent.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.index.webhook;
+package org.fairdatapoint.entity.index.webhook;
 
 public enum IndexWebhookEvent {
     NEW_ENTRY,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/membership/Membership.java b/src/main/java/org/fairdatapoint/entity/membership/Membership.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/membership/Membership.java
rename to src/main/java/org/fairdatapoint/entity/membership/Membership.java
index 32b897944..bf42b2e77 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/membership/Membership.java
+++ b/src/main/java/org/fairdatapoint/entity/membership/Membership.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.membership;
+package org.fairdatapoint.entity.membership;
 
 import io.hypersistence.utils.hibernate.type.array.ListArrayType;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.base.BaseEntity;
 import org.hibernate.annotations.Type;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/membership/MembershipPermission.java b/src/main/java/org/fairdatapoint/entity/membership/MembershipPermission.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/membership/MembershipPermission.java
rename to src/main/java/org/fairdatapoint/entity/membership/MembershipPermission.java
index 0a5e0d1de..be7338e6e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/membership/MembershipPermission.java
+++ b/src/main/java/org/fairdatapoint/entity/membership/MembershipPermission.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.membership;
+package org.fairdatapoint.entity.membership;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.base.BaseEntity;
 
 import java.util.UUID;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/AccessRights.java b/src/main/java/org/fairdatapoint/entity/metadata/AccessRights.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/AccessRights.java
rename to src/main/java/org/fairdatapoint/entity/metadata/AccessRights.java
index 7e6d410e5..c825269d3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/AccessRights.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/AccessRights.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Agent.java b/src/main/java/org/fairdatapoint/entity/metadata/Agent.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/Agent.java
rename to src/main/java/org/fairdatapoint/entity/metadata/Agent.java
index a9bd74e94..4f169a6d5 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Agent.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/Agent.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Authorization.java b/src/main/java/org/fairdatapoint/entity/metadata/Authorization.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/Authorization.java
rename to src/main/java/org/fairdatapoint/entity/metadata/Authorization.java
index 8e09c275a..9795fd454 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Authorization.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/Authorization.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Identifier.java b/src/main/java/org/fairdatapoint/entity/metadata/Identifier.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/Identifier.java
rename to src/main/java/org/fairdatapoint/entity/metadata/Identifier.java
index 6a4f08ba4..17b9489eb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Identifier.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/Identifier.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Metadata.java b/src/main/java/org/fairdatapoint/entity/metadata/Metadata.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/Metadata.java
rename to src/main/java/org/fairdatapoint/entity/metadata/Metadata.java
index 38b5af070..3287785e7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Metadata.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/Metadata.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
 public class Metadata {
 }
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataGetter.java b/src/main/java/org/fairdatapoint/entity/metadata/MetadataGetter.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataGetter.java
rename to src/main/java/org/fairdatapoint/entity/metadata/MetadataGetter.java
index 9aacafddb..985579172 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataGetter.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/MetadataGetter.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
-import nl.dtls.fairdatapoint.util.ValueFactoryHelper;
-import nl.dtls.fairdatapoint.vocabulary.FDP;
+import org.fairdatapoint.util.ValueFactoryHelper;
+import org.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 nl.dtls.fairdatapoint.util.RdfUtil.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatapoint.util.RdfUtil.*;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.l;
 
 public class MetadataGetter {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java b/src/main/java/org/fairdatapoint/entity/metadata/MetadataSetter.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java
rename to src/main/java/org/fairdatapoint/entity/metadata/MetadataSetter.java
index 9795efbd4..03c3116cf 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/MetadataSetter.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
-import nl.dtls.fairdatapoint.vocabulary.DCAT3;
-import nl.dtls.fairdatapoint.vocabulary.FDP;
-import nl.dtls.fairdatapoint.vocabulary.Sio;
+import org.fairdatapoint.vocabulary.DCAT3;
+import org.fairdatapoint.vocabulary.FDP;
+import org.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 nl.dtls.fairdatapoint.util.RdfUtil.update;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatapoint.util.RdfUtil.update;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.l;
 
 public class MetadataSetter {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataState.java b/src/main/java/org/fairdatapoint/entity/metadata/MetadataState.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataState.java
rename to src/main/java/org/fairdatapoint/entity/metadata/MetadataState.java
index f4a0c96b1..2bf71de12 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataState.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/MetadataState.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
 public enum MetadataState {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Metric.java b/src/main/java/org/fairdatapoint/entity/metadata/Metric.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/metadata/Metric.java
rename to src/main/java/org/fairdatapoint/entity/metadata/Metric.java
index 90d5f0f6e..6bb170b58 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/Metric.java
+++ b/src/main/java/org/fairdatapoint/entity/metadata/Metric.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.entity.metadata;
+package org.fairdatapoint.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/MetadataSchemaUsage.java b/src/main/java/org/fairdatapoint/entity/resource/MetadataSchemaUsage.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/resource/MetadataSchemaUsage.java
rename to src/main/java/org/fairdatapoint/entity/resource/MetadataSchemaUsage.java
index c2f804ab0..d004fa095 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/MetadataSchemaUsage.java
+++ b/src/main/java/org/fairdatapoint/entity/resource/MetadataSchemaUsage.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.resource;
+package org.fairdatapoint.entity.resource;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
@@ -29,7 +29,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.entity.schema.MetadataSchema;
 
 import java.util.UUID;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinition.java b/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinition.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinition.java
rename to src/main/java/org/fairdatapoint/entity/resource/ResourceDefinition.java
index c52af1da0..0555e284d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinition.java
+++ b/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinition.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.resource;
+package org.fairdatapoint.entity.resource;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.base.BaseEntity;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChild.java b/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChild.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChild.java
rename to src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChild.java
index 2af7afc3a..705868362 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChild.java
+++ b/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChild.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.resource;
+package org.fairdatapoint.entity.resource;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.entity.base.BaseEntity;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildMetadata.java b/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildMetadata.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildMetadata.java
rename to src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildMetadata.java
index 8d4bfe7f1..0f03e4f91 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildMetadata.java
+++ b/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionChildMetadata.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.resource;
+package org.fairdatapoint.entity.resource;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.entity.base.BaseEntity;
 
 @Entity(name = "ResourceDefinitionChildMetadata")
 @Table(name = "resource_definition_child_metadata")
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionLink.java b/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionLink.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionLink.java
rename to src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionLink.java
index 3862666fa..1cb4f642e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionLink.java
+++ b/src/main/java/org/fairdatapoint/entity/resource/ResourceDefinitionLink.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.resource;
+package org.fairdatapoint.entity.resource;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.api.validator.ValidIri;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.api.validator.ValidIri;
+import org.fairdatapoint.entity.base.BaseEntity;
 
 @Entity(name = "ResourceDefinitionLink")
 @Table(name = "resource_definition_link")
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchema.java b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchema.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchema.java
rename to src/main/java/org/fairdatapoint/entity/schema/MetadataSchema.java
index 3ce6cae55..1253aeb9d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchema.java
+++ b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchema.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.schema;
+package org.fairdatapoint.entity.schema;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -28,8 +28,8 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntityCustomUUID;
-import nl.dtls.fairdatapoint.entity.resource.MetadataSchemaUsage;
+import org.fairdatapoint.entity.base.BaseEntityCustomUUID;
+import org.fairdatapoint.entity.resource.MetadataSchemaUsage;
 
 import java.util.List;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaExtension.java b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaExtension.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaExtension.java
rename to src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaExtension.java
index 512971050..1bae57738 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaExtension.java
+++ b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaExtension.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.schema;
+package org.fairdatapoint.entity.schema;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaState.java b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaState.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaState.java
rename to src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaState.java
index ab6565ef5..2ffbb977b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaState.java
+++ b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaState.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.schema;
+package org.fairdatapoint.entity.schema;
 
 public enum MetadataSchemaState {
     DRAFT,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaType.java b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaType.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaType.java
rename to src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaType.java
index ea0fc938c..056eeb5ad 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaType.java
+++ b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaType.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.schema;
+package org.fairdatapoint.entity.schema;
 
 public enum MetadataSchemaType {
     INTERNAL, CUSTOM, REFERENCE
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaVersion.java b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaVersion.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaVersion.java
rename to src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaVersion.java
index b26dec86b..781dcf89d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaVersion.java
+++ b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaVersion.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.schema;
+package org.fairdatapoint.entity.schema;
 
 import io.hypersistence.utils.hibernate.type.array.ListArrayType;
 import jakarta.persistence.*;
@@ -28,7 +28,7 @@
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntityCustomUUID;
+import org.fairdatapoint.entity.base.BaseEntityCustomUUID;
 import org.hibernate.annotations.JdbcType;
 import org.hibernate.annotations.Type;
 import org.hibernate.dialect.PostgreSQLEnumJdbcType;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/schema/SemVer.java b/src/main/java/org/fairdatapoint/entity/schema/SemVer.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/entity/schema/SemVer.java
rename to src/main/java/org/fairdatapoint/entity/schema/SemVer.java
index 902a41af8..81d1340d8 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/schema/SemVer.java
+++ b/src/main/java/org/fairdatapoint/entity/schema/SemVer.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.schema;
+package org.fairdatapoint.entity.schema;
 
 import lombok.*;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterCacheContainer.java b/src/main/java/org/fairdatapoint/entity/search/SearchFilterCacheContainer.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterCacheContainer.java
rename to src/main/java/org/fairdatapoint/entity/search/SearchFilterCacheContainer.java
index 4d1e45d9c..df6a41ecb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterCacheContainer.java
+++ b/src/main/java/org/fairdatapoint/entity/search/SearchFilterCacheContainer.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.search;
+package org.fairdatapoint.entity.search;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterType.java b/src/main/java/org/fairdatapoint/entity/search/SearchFilterType.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterType.java
rename to src/main/java/org/fairdatapoint/entity/search/SearchFilterType.java
index df9d7b5e1..b81c0c618 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterType.java
+++ b/src/main/java/org/fairdatapoint/entity/search/SearchFilterType.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.search;
+package org.fairdatapoint.entity.search;
 
 public enum SearchFilterType {
     IRI,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterValue.java b/src/main/java/org/fairdatapoint/entity/search/SearchFilterValue.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterValue.java
rename to src/main/java/org/fairdatapoint/entity/search/SearchFilterValue.java
index 11fbd2ca0..c3e79438c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchFilterValue.java
+++ b/src/main/java/org/fairdatapoint/entity/search/SearchFilterValue.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.search;
+package org.fairdatapoint.entity.search;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchResult.java b/src/main/java/org/fairdatapoint/entity/search/SearchResult.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/search/SearchResult.java
rename to src/main/java/org/fairdatapoint/entity/search/SearchResult.java
index 54e51088d..07d85f7f5 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchResult.java
+++ b/src/main/java/org/fairdatapoint/entity/search/SearchResult.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.search;
+package org.fairdatapoint.entity.search;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchResultRelation.java b/src/main/java/org/fairdatapoint/entity/search/SearchResultRelation.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/search/SearchResultRelation.java
rename to src/main/java/org/fairdatapoint/entity/search/SearchResultRelation.java
index 365909c8f..44c8045ff 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchResultRelation.java
+++ b/src/main/java/org/fairdatapoint/entity/search/SearchResultRelation.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.search;
+package org.fairdatapoint.entity.search;
 
 import lombok.*;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchSavedQuery.java b/src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/entity/search/SearchSavedQuery.java
rename to src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
index 6522ebd86..c42596898 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchSavedQuery.java
+++ b/src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.search;
+package org.fairdatapoint.entity.search;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.user.UserAccount;
 import org.hibernate.annotations.JdbcType;
 import org.hibernate.dialect.PostgreSQLEnumJdbcType;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchSavedQueryType.java b/src/main/java/org/fairdatapoint/entity/search/SearchSavedQueryType.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/search/SearchSavedQueryType.java
rename to src/main/java/org/fairdatapoint/entity/search/SearchSavedQueryType.java
index 3fabe38a0..65e64c38f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/search/SearchSavedQueryType.java
+++ b/src/main/java/org/fairdatapoint/entity/search/SearchSavedQueryType.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.search;
+package org.fairdatapoint.entity.search;
 
 public enum SearchSavedQueryType {
     PUBLIC,
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/settings/Settings.java b/src/main/java/org/fairdatapoint/entity/settings/Settings.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/settings/Settings.java
rename to src/main/java/org/fairdatapoint/entity/settings/Settings.java
index 3326c3808..54851d0d8 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/settings/Settings.java
+++ b/src/main/java/org/fairdatapoint/entity/settings/Settings.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.settings;
+package org.fairdatapoint.entity.settings;
 
 import io.hypersistence.utils.hibernate.type.array.ListArrayType;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntityCustomUUID;
+import org.fairdatapoint.entity.base.BaseEntityCustomUUID;
 import org.hibernate.annotations.Type;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsAutocompleteSource.java b/src/main/java/org/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
rename to src/main/java/org/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
index c6766cf31..8baaad3e7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
+++ b/src/main/java/org/fairdatapoint/entity/settings/SettingsAutocompleteSource.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.settings;
+package org.fairdatapoint.entity.settings;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.base.BaseEntity;
 
 @Entity(name = "SettingsAutocompleteSource")
 @Table(name = "settings_autocomplete_source")
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsMetric.java b/src/main/java/org/fairdatapoint/entity/settings/SettingsMetric.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsMetric.java
rename to src/main/java/org/fairdatapoint/entity/settings/SettingsMetric.java
index e86f3a709..04edeb2d0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsMetric.java
+++ b/src/main/java/org/fairdatapoint/entity/settings/SettingsMetric.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.settings;
+package org.fairdatapoint.entity.settings;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.base.BaseEntity;
 
 @Entity(name = "SettingsMetric")
 @Table(name = "settings_metric")
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsSearchFilter.java b/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsSearchFilter.java
rename to src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
index a45d21cd3..9094542c2 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsSearchFilter.java
+++ b/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.settings;
+package org.fairdatapoint.entity.settings;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterType;
+import org.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.search.SearchFilterType;
 import org.hibernate.annotations.JdbcType;
 import org.hibernate.dialect.PostgreSQLEnumJdbcType;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsSearchFilterItem.java b/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
rename to src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
index 18f5475c4..91971d3f2 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
+++ b/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilterItem.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.settings;
+package org.fairdatapoint.entity.settings;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.base.BaseEntity;
 
 @Entity(name = "SettingsSearchFilterItem")
 @Table(name = "settings_search_filter_item")
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/user/UserAccount.java b/src/main/java/org/fairdatapoint/entity/user/UserAccount.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/entity/user/UserAccount.java
rename to src/main/java/org/fairdatapoint/entity/user/UserAccount.java
index 40fac2069..76d569408 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/user/UserAccount.java
+++ b/src/main/java/org/fairdatapoint/entity/user/UserAccount.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.user;
+package org.fairdatapoint.entity.user;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import nl.dtls.fairdatapoint.entity.apikey.ApiKey;
-import nl.dtls.fairdatapoint.entity.base.BaseEntity;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatapoint.entity.base.BaseEntity;
+import org.fairdatapoint.entity.search.SearchSavedQuery;
 import org.hibernate.annotations.JdbcType;
 import org.hibernate.dialect.PostgreSQLEnumJdbcType;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/user/UserPermission.java b/src/main/java/org/fairdatapoint/entity/user/UserPermission.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/entity/user/UserPermission.java
rename to src/main/java/org/fairdatapoint/entity/user/UserPermission.java
index eb4a2de2c..522daed27 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/user/UserPermission.java
+++ b/src/main/java/org/fairdatapoint/entity/user/UserPermission.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.user;
+package org.fairdatapoint.entity.user;
 
 import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.model.Permission;
diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/user/UserRole.java b/src/main/java/org/fairdatapoint/entity/user/UserRole.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/entity/user/UserRole.java
rename to src/main/java/org/fairdatapoint/entity/user/UserRole.java
index 168bf918e..445a95f65 100644
--- a/src/main/java/nl/dtls/fairdatapoint/entity/user/UserRole.java
+++ b/src/main/java/org/fairdatapoint/entity/user/UserRole.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.user;
+package org.fairdatapoint.entity.user;
 
 public enum UserRole {
     ADMIN,
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/UtilityService.java b/src/main/java/org/fairdatapoint/service/UtilityService.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/service/UtilityService.java
rename to src/main/java/org/fairdatapoint/service/UtilityService.java
index def3dfa4f..7aecdcddc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/UtilityService.java
+++ b/src/main/java/org/fairdatapoint/service/UtilityService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service;
+package org.fairdatapoint.service;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.config.properties.InstanceProperties;
-import nl.dtls.fairdatapoint.util.HttpUtil;
+import org.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatapoint.util.HttpUtil;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/actuator/AppInfoContributor.java b/src/main/java/org/fairdatapoint/service/actuator/AppInfoContributor.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/service/actuator/AppInfoContributor.java
rename to src/main/java/org/fairdatapoint/service/actuator/AppInfoContributor.java
index d8279082d..7e20433c9 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/actuator/AppInfoContributor.java
+++ b/src/main/java/org/fairdatapoint/service/actuator/AppInfoContributor.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.actuator;
+package org.fairdatapoint.service.actuator;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.actuate.info.Info;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/apikey/ApiKeyMapper.java b/src/main/java/org/fairdatapoint/service/apikey/ApiKeyMapper.java
similarity index 87%
rename from src/main/java/nl/dtls/fairdatapoint/service/apikey/ApiKeyMapper.java
rename to src/main/java/org/fairdatapoint/service/apikey/ApiKeyMapper.java
index 3451ffc3c..826955bc5 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/apikey/ApiKeyMapper.java
+++ b/src/main/java/org/fairdatapoint/service/apikey/ApiKeyMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.apikey;
+package org.fairdatapoint.service.apikey;
 
-import nl.dtls.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import nl.dtls.fairdatapoint.entity.apikey.ApiKey;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatapoint.entity.user.UserAccount;
 import org.springframework.stereotype.Component;
 
 import java.util.UUID;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/apikey/ApiKeyService.java b/src/main/java/org/fairdatapoint/service/apikey/ApiKeyService.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/service/apikey/ApiKeyService.java
rename to src/main/java/org/fairdatapoint/service/apikey/ApiKeyService.java
index 791150d86..144bbdedb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/apikey/ApiKeyService.java
+++ b/src/main/java/org/fairdatapoint/service/apikey/ApiKeyService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.apikey;
+package org.fairdatapoint.service.apikey;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import nl.dtls.fairdatapoint.database.db.repository.ApiKeyRepository;
-import nl.dtls.fairdatapoint.entity.apikey.ApiKey;
-import nl.dtls.fairdatapoint.entity.exception.ForbiddenException;
-import nl.dtls.fairdatapoint.entity.exception.UnauthorizedException;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
-import nl.dtls.fairdatapoint.service.security.AuthenticationService;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatapoint.database.db.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.UserAccount;
+import org.fairdatapoint.entity.user.UserRole;
+import org.fairdatapoint.service.security.AuthenticationService;
+import org.fairdatapoint.service.user.CurrentUserService;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/config/ConfigService.java b/src/main/java/org/fairdatapoint/service/config/ConfigService.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/service/config/ConfigService.java
rename to src/main/java/org/fairdatapoint/service/config/ConfigService.java
index aa6c23c8e..69ad95673 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/config/ConfigService.java
+++ b/src/main/java/org/fairdatapoint/service/config/ConfigService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.config;
+package org.fairdatapoint.service.config;
 
-import nl.dtls.fairdatapoint.api.dto.config.BootstrapConfigDTO;
-import nl.dtls.fairdatapoint.config.properties.InstanceProperties;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
-import nl.dtls.fairdatapoint.service.settings.SettingsService;
+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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/dashboard/DashboardService.java b/src/main/java/org/fairdatapoint/service/dashboard/DashboardService.java
similarity index 77%
rename from src/main/java/nl/dtls/fairdatapoint/service/dashboard/DashboardService.java
rename to src/main/java/org/fairdatapoint/service/dashboard/DashboardService.java
index 888493f75..5c05d362f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/dashboard/DashboardService.java
+++ b/src/main/java/org/fairdatapoint/service/dashboard/DashboardService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.dashboard;
+package org.fairdatapoint.service.dashboard;
 
-import nl.dtls.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipDTO;
-import nl.dtls.fairdatapoint.entity.metadata.Metadata;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import nl.dtls.fairdatapoint.service.member.MemberService;
-import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.metadata.state.MetadataStateService;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionCache;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
+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.metadata.MetadataState;
+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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Value;
@@ -46,9 +46,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getTitle;
-import static nl.dtls.fairdatapoint.util.RdfUtil.getObjectsBy;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.entity.metadata.MetadataGetter.getTitle;
+import static org.fairdatapoint.util.RdfUtil.getObjectsBy;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class DashboardService {
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java b/src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
rename to src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
index 807ce925e..f4ec750bd 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
+++ b/src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteCache.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.form.autocomplete;
+package org.fairdatapoint.service.form.autocomplete;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.entity.forms.RdfEntityCacheContainer;
+import org.fairdatapoint.entity.forms.RdfEntityCacheContainer;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Component;
 
-import static nl.dtls.fairdatapoint.config.CacheConfig.FORMS_AUTOCOMPLETE_CACHE;
+import static org.fairdatapoint.config.CacheConfig.FORMS_AUTOCOMPLETE_CACHE;
 
 @Component
 @RequiredArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java b/src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
rename to src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
index 982876b47..dd41656fa 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
+++ b/src/main/java/org/fairdatapoint/service/form/autocomplete/FormsAutocompleteService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.form.autocomplete;
+package org.fairdatapoint.service.form.autocomplete;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
-import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
-import nl.dtls.fairdatapoint.entity.forms.RdfEntityCacheContainer;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesNamespaceRetriever;
-import nl.dtls.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesRetriever;
-import nl.dtls.fairdatapoint.service.form.autocomplete.retrieval.RdfEntitiesSparqlRetriever;
-import nl.dtls.fairdatapoint.service.settings.SettingsService;
+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.springframework.stereotype.Service;
 
 import java.util.Collections;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java b/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
rename to src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
index f6302ff88..f50ad032f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
+++ b/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesNamespaceRetriever.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.form.autocomplete.retrieval;
+package org.fairdatapoint.service.form.autocomplete.retrieval;
 
 import lombok.SneakyThrows;
-import nl.dtls.fairdatapoint.entity.forms.RdfEntitySourceType;
+import org.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 nl.dtls.fairdatapoint.util.RdfUtil.getStringObjectBy;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.RdfUtil.getStringObjectBy;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Component
 public class RdfEntitiesNamespaceRetriever implements RdfEntitiesRetriever {
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java b/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
rename to src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
index 474934d9e..35f93dc99 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
+++ b/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesRetriever.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.form.autocomplete.retrieval;
+package org.fairdatapoint.service.form.autocomplete.retrieval;
 
-import nl.dtls.fairdatapoint.entity.forms.RdfEntitySourceType;
+import org.fairdatapoint.entity.forms.RdfEntitySourceType;
 
 import java.util.Map;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java b/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
rename to src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
index 0de8b5e83..2f8bcb77f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
+++ b/src/main/java/org/fairdatapoint/service/form/autocomplete/retrieval/RdfEntitiesSparqlRetriever.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.form.autocomplete.retrieval;
+package org.fairdatapoint.service.form.autocomplete.retrieval;
 
-import nl.dtls.fairdatapoint.entity.forms.RdfEntitySourceType;
-import nl.dtls.fairdatapoint.entity.settings.SettingsAutocompleteSource;
-import nl.dtls.fairdatapoint.service.settings.SettingsService;
+import org.fairdatapoint.entity.forms.RdfEntitySourceType;
+import org.fairdatapoint.entity.settings.SettingsAutocompleteSource;
+import org.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/nl/dtls/fairdatapoint/service/index/common/IndexFeatureAspect.java b/src/main/java/org/fairdatapoint/service/index/common/IndexFeatureAspect.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/common/IndexFeatureAspect.java
rename to src/main/java/org/fairdatapoint/service/index/common/IndexFeatureAspect.java
index aa063d5cc..8165b107c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/common/IndexFeatureAspect.java
+++ b/src/main/java/org/fairdatapoint/service/index/common/IndexFeatureAspect.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.common;
+package org.fairdatapoint.service.index.common;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import nl.dtls.fairdatapoint.config.properties.InstanceProperties;
-import nl.dtls.fairdatapoint.entity.exception.FeatureDisabledException;
+import org.fairdatapoint.config.properties.InstanceProperties;
+import org.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 final InstanceProperties instanceProperties;
 
     @SneakyThrows
-    @Around("@annotation(nl.dtls.fairdatapoint.service.index.common.RequiredEnabledIndexFeature)")
+    @Around("@annotation(org.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/nl/dtls/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java b/src/main/java/org/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
rename to src/main/java/org/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
index 6f9654306..22ee0c7ec 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
+++ b/src/main/java/org/fairdatapoint/service/index/common/RequiredEnabledIndexFeature.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.common;
+package org.fairdatapoint.service.index.common;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryMapper.java b/src/main/java/org/fairdatapoint/service/index/entry/IndexEntryMapper.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryMapper.java
rename to src/main/java/org/fairdatapoint/service/index/entry/IndexEntryMapper.java
index e97e4a801..44b7d52f5 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryMapper.java
+++ b/src/main/java/org/fairdatapoint/service/index/entry/IndexEntryMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.entry;
+package org.fairdatapoint.service.index.entry;
 
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryState;
-import nl.dtls.fairdatapoint.entity.index.entry.RepositoryMetadata;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.service.index.event.EventMapper;
+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.entry.RepositoryMetadata;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.service.index.event.EventMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryService.java b/src/main/java/org/fairdatapoint/service/index/entry/IndexEntryService.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryService.java
rename to src/main/java/org/fairdatapoint/service/index/entry/IndexEntryService.java
index 17e117e9f..df0e4dfbc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryService.java
+++ b/src/main/java/org/fairdatapoint/service/index/entry/IndexEntryService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,28 +20,28 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.entry;
+package org.fairdatapoint.service.index.entry;
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.index.entry.*;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEntryRepository;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEventRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryState;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.settings.IndexSettings;
-import nl.dtls.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
-import nl.dtls.fairdatapoint.service.index.harvester.HarvesterService;
-import nl.dtls.fairdatapoint.service.index.settings.IndexSettingsService;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatapoint.api.dto.index.entry.*;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.db.repository.IndexEntryRepository;
+import org.fairdatapoint.database.db.repository.IndexEventRepository;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+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.IndexEntryPermit;
+import org.fairdatapoint.entity.index.entry.IndexEntryState;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
+import org.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatapoint.service.index.settings.IndexSettingsService;
+import org.fairdatapoint.service.user.CurrentUserService;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.impl.TreeModel;
 import org.springframework.data.domain.Page;
@@ -57,8 +57,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import static nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.api.dto.index.entry.IndexEntryStateDTO.*;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 import static org.lwjgl.system.MemoryUtil.PAGE_SIZE;
 
 @Slf4j
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/event/EventMapper.java b/src/main/java/org/fairdatapoint/service/index/event/EventMapper.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/event/EventMapper.java
rename to src/main/java/org/fairdatapoint/service/index/event/EventMapper.java
index b34bea19b..8880808ee 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/event/EventMapper.java
+++ b/src/main/java/org/fairdatapoint/service/index/event/EventMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.event;
+package org.fairdatapoint.service.index.event;
 
-import nl.dtls.fairdatapoint.api.dto.index.event.EventDTO;
-import nl.dtls.fairdatapoint.entity.index.event.payload.AdminTrigger;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.api.dto.index.event.EventDTO;
+import org.fairdatapoint.entity.index.event.payload.AdminTrigger;
+import org.fairdatapoint.entity.index.event.IndexEvent;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/event/EventService.java b/src/main/java/org/fairdatapoint/service/index/event/EventService.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/event/EventService.java
rename to src/main/java/org/fairdatapoint/service/index/event/EventService.java
index c49a32ac9..b0da98058 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/event/EventService.java
+++ b/src/main/java/org/fairdatapoint/service/index/event/EventService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.event;
+package org.fairdatapoint.service.index.event;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.PostConstruct;
@@ -29,26 +29,26 @@
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEntryRepository;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEventRepository;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryState;
-import nl.dtls.fairdatapoint.entity.index.entry.RepositoryMetadata;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEventType;
-import nl.dtls.fairdatapoint.entity.index.exception.IncorrectPingFormatException;
-import nl.dtls.fairdatapoint.entity.index.exception.PingDeniedException;
-import nl.dtls.fairdatapoint.entity.index.exception.RateLimitException;
-import nl.dtls.fairdatapoint.entity.index.http.Exchange;
-import nl.dtls.fairdatapoint.entity.index.http.ExchangeState;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexPing;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
-import nl.dtls.fairdatapoint.service.UtilityService;
-import nl.dtls.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
-import nl.dtls.fairdatapoint.service.index.entry.IndexEntryService;
-import nl.dtls.fairdatapoint.service.index.settings.IndexSettingsService;
-import nl.dtls.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.db.repository.IndexEntryRepository;
+import org.fairdatapoint.database.db.repository.IndexEventRepository;
+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.IndexEvent;
+import org.fairdatapoint.entity.index.event.IndexEventType;
+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.SettingsIndexPing;
+import org.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
+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.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/event/IncomingPingUtils.java b/src/main/java/org/fairdatapoint/service/index/event/IncomingPingUtils.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/event/IncomingPingUtils.java
rename to src/main/java/org/fairdatapoint/service/index/event/IncomingPingUtils.java
index 19a7c07d7..ddcf8ea42 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/event/IncomingPingUtils.java
+++ b/src/main/java/org/fairdatapoint/service/index/event/IncomingPingUtils.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.event;
+package org.fairdatapoint.service.index.event;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.event.payload.IncomingPing;
-import nl.dtls.fairdatapoint.entity.index.http.Exchange;
-import nl.dtls.fairdatapoint.entity.index.http.ExchangeDirection;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.entity.index.event.payload.IncomingPing;
+import org.fairdatapoint.entity.index.http.Exchange;
+import org.fairdatapoint.entity.index.http.ExchangeDirection;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/event/MetadataRetrievalUtils.java b/src/main/java/org/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
rename to src/main/java/org/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
index 4699c704b..5d688fb91 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
+++ b/src/main/java/org/fairdatapoint/service/index/event/MetadataRetrievalUtils.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.event;
-
-import nl.dtls.fairdatapoint.entity.index.entry.RepositoryMetadata;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEventType;
-import nl.dtls.fairdatapoint.entity.index.event.payload.MetadataRetrieval;
-import nl.dtls.fairdatapoint.entity.index.http.Exchange;
-import nl.dtls.fairdatapoint.entity.index.http.ExchangeDirection;
-import nl.dtls.fairdatapoint.entity.index.http.ExchangeState;
-import nl.dtls.fairdatapoint.service.index.entry.IndexEntryService;
-import nl.dtls.fairdatapoint.vocabulary.DCAT3;
-import nl.dtls.fairdatapoint.vocabulary.FDP;
-import nl.dtls.fairdatapoint.vocabulary.R3D;
+package org.fairdatapoint.service.index.event;
+
+import org.fairdatapoint.entity.index.entry.RepositoryMetadata;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.entity.index.event.IndexEventType;
+import org.fairdatapoint.entity.index.event.payload.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;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/harvester/HarvesterService.java b/src/main/java/org/fairdatapoint/service/index/harvester/HarvesterService.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/harvester/HarvesterService.java
rename to src/main/java/org/fairdatapoint/service/index/harvester/HarvesterService.java
index 08975b3d4..178fd624e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/harvester/HarvesterService.java
+++ b/src/main/java/org/fairdatapoint/service/index/harvester/HarvesterService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.harvester;
+package org.fairdatapoint.service.index.harvester;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
@@ -44,13 +44,13 @@
 import java.util.*;
 
 import static java.util.Optional.ofNullable;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getChildren;
-import static nl.dtls.fairdatapoint.util.HttpUtil.getRdfContentType;
-import static nl.dtls.fairdatapoint.util.RdfIOUtil.read;
-import static nl.dtls.fairdatapoint.util.RdfIOUtil.readFile;
-import static nl.dtls.fairdatapoint.util.RdfUtil.getObjectsBy;
-import static nl.dtls.fairdatapoint.util.RdfUtil.getSubjectsBy;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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;
 
 @Slf4j
 @Service
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsDefaults.java b/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsDefaults.java
similarity index 81%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsDefaults.java
rename to src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsDefaults.java
index 1d999cd8d..1b60f8bbf 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsDefaults.java
+++ b/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsDefaults.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.settings;
+package org.fairdatapoint.service.index.settings;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.config.properties.InstanceProperties;
-import nl.dtls.fairdatapoint.entity.index.settings.IndexSettings;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexPing;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatapoint.entity.index.settings.SettingsIndexPing;
+import org.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsMapper.java b/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsMapper.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsMapper.java
rename to src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsMapper.java
index a803fcad3..7108881ba 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsMapper.java
+++ b/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.settings;
+package org.fairdatapoint.service.index.settings;
 
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsPingDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsRetrievalDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import nl.dtls.fairdatapoint.entity.index.settings.IndexSettings;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexPing;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
+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.SettingsIndexPing;
+import org.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsService.java b/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsService.java
similarity index 82%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsService.java
rename to src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsService.java
index 212c3a24b..be38a6550 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/settings/IndexSettingsService.java
+++ b/src/main/java/org/fairdatapoint/service/index/settings/IndexSettingsService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.settings;
+package org.fairdatapoint.service.index.settings;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexSettingsRepository;
-import nl.dtls.fairdatapoint.entity.index.settings.IndexSettings;
-import nl.dtls.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.IndexSettingsRepository;
+import org.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.springframework.stereotype.Service;
 
 import java.util.regex.Pattern;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookMapper.java b/src/main/java/org/fairdatapoint/service/index/webhook/WebhookMapper.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookMapper.java
rename to src/main/java/org/fairdatapoint/service/index/webhook/WebhookMapper.java
index 64f012866..4e9dd85e0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookMapper.java
+++ b/src/main/java/org/fairdatapoint/service/index/webhook/WebhookMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.webhook;
+package org.fairdatapoint.service.index.webhook;
 
-import nl.dtls.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.event.payload.WebhookPing;
-import nl.dtls.fairdatapoint.entity.index.event.payload.WebhookTrigger;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhook;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
+import org.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.entity.index.event.payload.WebhookPing;
+import org.fairdatapoint.entity.index.event.payload.WebhookTrigger;
+import org.fairdatapoint.entity.index.webhook.IndexWebhook;
+import org.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookService.java b/src/main/java/org/fairdatapoint/service/index/webhook/WebhookService.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookService.java
rename to src/main/java/org/fairdatapoint/service/index/webhook/WebhookService.java
index ae99f7826..a6489b16c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookService.java
+++ b/src/main/java/org/fairdatapoint/service/index/webhook/WebhookService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,24 +20,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.webhook;
+package org.fairdatapoint.service.index.webhook;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEventRepository;
-import nl.dtls.fairdatapoint.database.db.repository.IndexWebhookRepository;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhook;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
-import nl.dtls.fairdatapoint.service.UtilityService;
-import nl.dtls.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
-import nl.dtls.fairdatapoint.service.index.settings.IndexSettingsService;
+import org.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO;
+import org.fairdatapoint.database.db.repository.IndexEventRepository;
+import org.fairdatapoint.database.db.repository.IndexWebhookRepository;
+import org.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
+import org.fairdatapoint.entity.index.webhook.IndexWebhook;
+import org.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
+import org.fairdatapoint.service.UtilityService;
+import org.fairdatapoint.service.index.common.RequiredEnabledIndexFeature;
+import org.fairdatapoint.service.index.settings.IndexSettingsService;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookUtils.java b/src/main/java/org/fairdatapoint/service/index/webhook/WebhookUtils.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookUtils.java
rename to src/main/java/org/fairdatapoint/service/index/webhook/WebhookUtils.java
index d4ee7e931..2e9c19adb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookUtils.java
+++ b/src/main/java/org/fairdatapoint/service/index/webhook/WebhookUtils.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.webhook;
+package org.fairdatapoint.service.index.webhook;
 
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.http.Exchange;
-import nl.dtls.fairdatapoint.entity.index.http.ExchangeDirection;
-import nl.dtls.fairdatapoint.entity.index.http.ExchangeState;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhook;
-import nl.dtls.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+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.IndexWebhook;
+import org.fairdatapoint.entity.index.webhook.IndexWebhookEvent;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/jwt/JwtService.java b/src/main/java/org/fairdatapoint/service/jwt/JwtService.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/service/jwt/JwtService.java
rename to src/main/java/org/fairdatapoint/service/jwt/JwtService.java
index ac4d26754..89525a9e0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/jwt/JwtService.java
+++ b/src/main/java/org/fairdatapoint/service/jwt/JwtService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.jwt;
+package org.fairdatapoint.service.jwt;
 
 import io.jsonwebtoken.*;
 import jakarta.annotation.PostConstruct;
-import nl.dtls.fairdatapoint.api.dto.auth.AuthDTO;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.exception.UnauthorizedException;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.security.AuthenticationService;
+import org.fairdatapoint.api.dto.auth.AuthDTO;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.exception.UnauthorizedException;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.security.AuthenticationService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.authentication.AuthenticationManager;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/label/LabelService.java b/src/main/java/org/fairdatapoint/service/label/LabelService.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/service/label/LabelService.java
rename to src/main/java/org/fairdatapoint/service/label/LabelService.java
index 5ec1b0dc5..2872727a2 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/label/LabelService.java
+++ b/src/main/java/org/fairdatapoint/service/label/LabelService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.label;
+package org.fairdatapoint.service.label;
 
 import static java.util.function.Predicate.isEqual;
-import static nl.dtls.fairdatapoint.config.CacheConfig.LABEL_CACHE;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.config.CacheConfig.LABEL_CACHE;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 import com.github.fairdevkit.rdf.resolver.api.ResourceResolver;
 import com.github.fairdevkit.rdf.resolver.core.ContentNegotiationStrategy;
 import com.github.fairdevkit.rdf.resolver.core.CoreResourceResolver;
@@ -32,7 +32,7 @@
 import java.util.Optional;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.label.LabelDTO;
+import org.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/nl/dtls/fairdatapoint/service/member/MemberMapper.java b/src/main/java/org/fairdatapoint/service/member/MemberMapper.java
similarity index 81%
rename from src/main/java/nl/dtls/fairdatapoint/service/member/MemberMapper.java
rename to src/main/java/org/fairdatapoint/service/member/MemberMapper.java
index ca1d7b5f7..6e95cbffd 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/member/MemberMapper.java
+++ b/src/main/java/org/fairdatapoint/service/member/MemberMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.member;
+package org.fairdatapoint.service.member;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.membership.MembershipMapper;
-import nl.dtls.fairdatapoint.service.user.UserMapper;
+import org.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.membership.MembershipMapper;
+import org.fairdatapoint.service.user.UserMapper;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/member/MemberService.java b/src/main/java/org/fairdatapoint/service/member/MemberService.java
similarity index 93%
rename from src/main/java/nl/dtls/fairdatapoint/service/member/MemberService.java
rename to src/main/java/org/fairdatapoint/service/member/MemberService.java
index 69f134275..728568348 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/member/MemberService.java
+++ b/src/main/java/org/fairdatapoint/service/member/MemberService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.member;
+package org.fairdatapoint.service.member;
 
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.membership.MembershipPermission;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
-import nl.dtls.fairdatapoint.service.membership.PermissionService;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatapoint.api.dto.member.MemberDTO;
+import org.fairdatapoint.database.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.membership.MembershipPermission;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.entity.user.UserRole;
+import org.fairdatapoint.service.membership.PermissionService;
+import org.fairdatapoint.service.user.CurrentUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.domain.ObjectIdentityImpl;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/membership/MembershipMapper.java b/src/main/java/org/fairdatapoint/service/membership/MembershipMapper.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/service/membership/MembershipMapper.java
rename to src/main/java/org/fairdatapoint/service/membership/MembershipMapper.java
index b4ec87370..e431b4f41 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/membership/MembershipMapper.java
+++ b/src/main/java/org/fairdatapoint/service/membership/MembershipMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.membership;
+package org.fairdatapoint.service.membership;
 
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipDTO;
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipPermissionDTO;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.membership.MembershipPermission;
+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.springframework.stereotype.Service;
 
 import java.util.stream.Collectors;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/membership/MembershipService.java b/src/main/java/org/fairdatapoint/service/membership/MembershipService.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/service/membership/MembershipService.java
rename to src/main/java/org/fairdatapoint/service/membership/MembershipService.java
index bf16a6701..34f8606fb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/membership/MembershipService.java
+++ b/src/main/java/org/fairdatapoint/service/membership/MembershipService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.membership;
+package org.fairdatapoint.service.membership;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatapoint.database.db.repository.MembershipRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/membership/PermissionService.java b/src/main/java/org/fairdatapoint/service/membership/PermissionService.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/service/membership/PermissionService.java
rename to src/main/java/org/fairdatapoint/service/membership/PermissionService.java
index cf07443a4..a3bc3895b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/membership/PermissionService.java
+++ b/src/main/java/org/fairdatapoint/service/membership/PermissionService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.membership;
+package org.fairdatapoint.service.membership;
 
-import nl.dtls.fairdatapoint.entity.membership.MembershipPermission;
-import nl.dtls.fairdatapoint.entity.user.UserPermission;
+import org.fairdatapoint.entity.membership.MembershipPermission;
+import org.fairdatapoint.entity.user.UserPermission;
 import org.springframework.security.acls.model.Permission;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java b/src/main/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
similarity index 81%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
rename to src/main/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
index c4dd75d36..efb2a2627 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.catalog;
+package org.fairdatapoint.service.metadata.catalog;
 
 import jakarta.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.service.metadata.common.AbstractMetadataService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@
 
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.setThemeTaxonomies;
+import static org.fairdatapoint.entity.metadata.MetadataSetter.setThemeTaxonomies;
 
 @Slf4j
 @Service("catalogMetadataService")
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/common/AbstractMetadataService.java b/src/main/java/org/fairdatapoint/service/metadata/common/AbstractMetadataService.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/common/AbstractMetadataService.java
rename to src/main/java/org/fairdatapoint/service/metadata/common/AbstractMetadataService.java
index 5cb468f3c..a91c39f56 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/common/AbstractMetadataService.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/common/AbstractMetadataService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,27 +20,27 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.common;
+package org.fairdatapoint.service.metadata.common;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.common.MetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.exception.ForbiddenException;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.metadata.Metadata;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataGetter;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberService;
-import nl.dtls.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.metadata.validator.MetadataValidator;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionCache;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
-import nl.dtls.fairdatapoint.vocabulary.FDP;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.common.MetadataRepository;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.entity.exception.ForbiddenException;
+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.UserAccount;
+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.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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -53,10 +53,10 @@
 import java.util.*;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getChildren;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getParent;
-import static nl.dtls.fairdatapoint.util.ThrowingFunction.suppress;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.*;
+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.*;
 
 @Slf4j
 public abstract class AbstractMetadataService implements MetadataService {
@@ -150,7 +150,7 @@ public Model store(
     @Override
     @PreAuthorize("""
             hasPermission(#uri.stringValue(),
-            'nl.dtls.fairdatapoint.entity.metadata.Metadata', 'WRITE')
+            'org.fairdatapoint.entity.metadata.Metadata', 'WRITE')
             or hasRole('ADMIN')
             """)
     public Model update(
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/common/MetadataService.java b/src/main/java/org/fairdatapoint/service/metadata/common/MetadataService.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/common/MetadataService.java
rename to src/main/java/org/fairdatapoint/service/metadata/common/MetadataService.java
index 3b79801c5..b1bbbda95 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/common/MetadataService.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/common/MetadataService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.common;
+package org.fairdatapoint.service.metadata.common;
 
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java b/src/main/java/org/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
similarity index 84%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
rename to src/main/java/org/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
index 4f6c5e84e..e2b305ab3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/enhance/MetadataEnhancer.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.enhance;
-
-import nl.dtls.fairdatapoint.entity.metadata.Identifier;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import nl.dtls.fairdatapoint.service.actuator.AppInfoContributor;
-import nl.dtls.fairdatapoint.service.metadata.metric.MetricsMetadataService;
-import nl.dtls.fairdatapoint.service.profile.ProfileService;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionCache;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
-import nl.dtls.fairdatapoint.util.ValueFactoryHelper;
-import nl.dtls.fairdatapoint.vocabulary.DATACITE;
-import nl.dtls.fairdatapoint.vocabulary.FDP;
+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;
 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 nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.*;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static nl.dtls.fairdatapoint.util.RdfUtil.containsObject;
-import static nl.dtls.fairdatapoint.util.RdfUtil.getObjectsBy;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+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;
 
 @Service
 public class MetadataEnhancer {
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/exception/MetadataServiceException.java b/src/main/java/org/fairdatapoint/service/metadata/exception/MetadataServiceException.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/exception/MetadataServiceException.java
rename to src/main/java/org/fairdatapoint/service/metadata/exception/MetadataServiceException.java
index 31c2b7fcc..c1f2059fb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/exception/MetadataServiceException.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/exception/MetadataServiceException.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.service.metadata.exception;
+package org.fairdatapoint.service.metadata.exception;
 
 /**
  * @author Rajaram Kaliyaperumal
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java b/src/main/java/org/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
rename to src/main/java/org/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
index 49dead447..9ccb2ba52 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/factory/MetadataServiceFactory.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.factory;
+package org.fairdatapoint.service.metadata.factory;
 
-import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
+import org.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/nl/dtls/fairdatapoint/service/metadata/generic/GenericMetadataService.java b/src/main/java/org/fairdatapoint/service/metadata/generic/GenericMetadataService.java
similarity index 77%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/generic/GenericMetadataService.java
rename to src/main/java/org/fairdatapoint/service/metadata/generic/GenericMetadataService.java
index 11929a4ca..a1fb4a55f 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/generic/GenericMetadataService.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/generic/GenericMetadataService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.generic;
+package org.fairdatapoint.service.metadata.generic;
 
-import nl.dtls.fairdatapoint.entity.exception.ForbiddenException;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.metadata.Metadata;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
-import nl.dtls.fairdatapoint.service.metadata.common.AbstractMetadataService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
+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.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 nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getParent;
+import static org.fairdatapoint.entity.metadata.MetadataGetter.getParent;
 
 @Service("genericMetadataService")
 public class GenericMetadataService extends AbstractMetadataService {
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/metric/MetricsMetadataService.java b/src/main/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
similarity index 85%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
rename to src/main/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
index e4bd1949d..13479d00a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +25,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.service.metadata.metric;
+package org.fairdatapoint.service.metadata.metric;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.entity.metadata.Metric;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.entity.settings.SettingsMetric;
-import nl.dtls.fairdatapoint.service.settings.SettingsService;
+import org.fairdatapoint.entity.metadata.Metric;
+import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatapoint.entity.settings.SettingsMetric;
+import org.fairdatapoint.service.settings.SettingsService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.eclipse.rdf4j.model.IRI;
 import org.springframework.stereotype.Service;
@@ -40,7 +40,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 @Service
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/state/MetadataStateService.java b/src/main/java/org/fairdatapoint/service/metadata/state/MetadataStateService.java
similarity index 83%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/state/MetadataStateService.java
rename to src/main/java/org/fairdatapoint/service/metadata/state/MetadataStateService.java
index 47835349d..998ad4d31 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/state/MetadataStateService.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/state/MetadataStateService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.state;
+package org.fairdatapoint.service.metadata.state;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.common.MetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+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.metadata.MetadataState;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatapoint.service.user.CurrentUserService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,8 +46,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static nl.dtls.fairdatapoint.util.RdfUtil.getObjectsBy;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.RdfUtil.getObjectsBy;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 @Service
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/metadata/validator/MetadataValidator.java b/src/main/java/org/fairdatapoint/service/metadata/validator/MetadataValidator.java
similarity index 80%
rename from src/main/java/nl/dtls/fairdatapoint/service/metadata/validator/MetadataValidator.java
rename to src/main/java/org/fairdatapoint/service/metadata/validator/MetadataValidator.java
index 0fda41c2f..dd7368672 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/metadata/validator/MetadataValidator.java
+++ b/src/main/java/org/fairdatapoint/service/metadata/validator/MetadataValidator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.validator;
+package org.fairdatapoint.service.metadata.validator;
 
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.common.MetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.rdf.ShaclValidator;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
-import nl.dtls.fairdatapoint.service.schema.MetadataSchemaService;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
@@ -39,8 +39,8 @@
 import org.springframework.stereotype.Service;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getParent;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.entity.metadata.MetadataGetter.getParent;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class MetadataValidator {
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiGenerator.java b/src/main/java/org/fairdatapoint/service/openapi/OpenApiGenerator.java
similarity index 98%
rename from src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiGenerator.java
rename to src/main/java/org/fairdatapoint/service/openapi/OpenApiGenerator.java
index eabba69b7..d947a2444 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiGenerator.java
+++ b/src/main/java/org/fairdatapoint/service/openapi/OpenApiGenerator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.openapi;
+package org.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 nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberCreateDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
+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.springframework.http.HttpStatus;
 import org.springframework.util.StringUtils;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiService.java b/src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiService.java
rename to src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java
index 1d05168ba..49b1892be 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiService.java
+++ b/src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.openapi;
+package org.fairdatapoint.service.openapi;
 
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.PathItem;
@@ -28,8 +28,8 @@
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiTagsUtils.java b/src/main/java/org/fairdatapoint/service/openapi/OpenApiTagsUtils.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiTagsUtils.java
rename to src/main/java/org/fairdatapoint/service/openapi/OpenApiTagsUtils.java
index 75ca92a1d..c22f3ea22 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiTagsUtils.java
+++ b/src/main/java/org/fairdatapoint/service/openapi/OpenApiTagsUtils.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.openapi;
+package org.fairdatapoint.service.openapi;
 
 import io.swagger.v3.oas.models.tags.Tag;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/ping/PingService.java b/src/main/java/org/fairdatapoint/service/ping/PingService.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/service/ping/PingService.java
rename to src/main/java/org/fairdatapoint/service/ping/PingService.java
index b95b92efe..79962c428 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/ping/PingService.java
+++ b/src/main/java/org/fairdatapoint/service/ping/PingService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.ping;
+package org.fairdatapoint.service.ping;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.config.properties.InstanceProperties;
-import nl.dtls.fairdatapoint.config.properties.PingProperties;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.service.settings.SettingsService;
+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.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/profile/ProfileService.java b/src/main/java/org/fairdatapoint/service/profile/ProfileService.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/service/profile/ProfileService.java
rename to src/main/java/org/fairdatapoint/service/profile/ProfileService.java
index b71b908bb..d198d89a7 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/profile/ProfileService.java
+++ b/src/main/java/org/fairdatapoint/service/profile/ProfileService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.profile;
+package org.fairdatapoint.service.profile;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.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.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.*;
+import static org.fairdatapoint.util.ValueFactoryHelper.*;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/rdf/ShaclValidator.java b/src/main/java/org/fairdatapoint/service/rdf/ShaclValidator.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/service/rdf/ShaclValidator.java
rename to src/main/java/org/fairdatapoint/service/rdf/ShaclValidator.java
index 7a8ffd950..e2f39cbdb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/rdf/ShaclValidator.java
+++ b/src/main/java/org/fairdatapoint/service/rdf/ShaclValidator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.rdf;
+package org.fairdatapoint.service.rdf;
 
-import nl.dtls.fairdatapoint.entity.exception.RdfValidationException;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatapoint.entity.exception.RdfValidationException;
+import org.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 nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Service
 public class ShaclValidator {
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/org/fairdatapoint/service/reset/FactoryDefaults.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/service/reset/FactoryDefaults.java
rename to src/main/java/org/fairdatapoint/service/reset/FactoryDefaults.java
index df3e6c2a0..7b0470eb0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/reset/FactoryDefaults.java
+++ b/src/main/java/org/fairdatapoint/service/reset/FactoryDefaults.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.reset;
+package org.fairdatapoint.service.reset;
 
-import nl.dtls.fairdatapoint.entity.schema.SemVer;
-import nl.dtls.fairdatapoint.vocabulary.DATACITE;
-import nl.dtls.fairdatapoint.vocabulary.DCAT3;
-import nl.dtls.fairdatapoint.vocabulary.FDP;
-import nl.dtls.fairdatapoint.vocabulary.R3D;
+import org.fairdatapoint.entity.schema.SemVer;
+import org.fairdatapoint.vocabulary.DATACITE;
+import org.fairdatapoint.vocabulary.DCAT3;
+import org.fairdatapoint.vocabulary.FDP;
+import org.fairdatapoint.vocabulary.R3D;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.vocabulary.*;
@@ -35,7 +35,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.*;
+import static org.fairdatapoint.util.ValueFactoryHelper.*;
 
 public class FactoryDefaults {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/reset/ResetService.java b/src/main/java/org/fairdatapoint/service/reset/ResetService.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/service/reset/ResetService.java
rename to src/main/java/org/fairdatapoint/service/reset/ResetService.java
index 5b3519196..0a086cc23 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/reset/ResetService.java
+++ b/src/main/java/org/fairdatapoint/service/reset/ResetService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.reset;
+package org.fairdatapoint.service.reset;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.reset.ResetDTO;
-import nl.dtls.fairdatapoint.database.db.repository.*;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import nl.dtls.fairdatapoint.service.metadata.generic.GenericMetadataService;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionCache;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import nl.dtls.fairdatapoint.service.settings.SettingsService;
+import org.fairdatapoint.api.dto.reset.ResetDTO;
+import org.fairdatapoint.database.db.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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.repository.Repository;
@@ -46,7 +46,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 @Service
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCache.java b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionCache.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCache.java
rename to src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionCache.java
index 54d620040..a00a96b70 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCache.java
+++ b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionCache.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.resource;
+package org.fairdatapoint.service.resource;
 
 import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionChildRepository;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionChildRepository;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Service;
@@ -35,8 +35,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static nl.dtls.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_CACHE;
-import static nl.dtls.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_PARENT_CACHE;
+import static org.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_CACHE;
+import static org.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_PARENT_CACHE;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionMapper.java b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionMapper.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionMapper.java
rename to src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionMapper.java
index 41da4e303..19f6b5ea6 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionMapper.java
+++ b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.resource;
+package org.fairdatapoint.service.resource;
 
-import nl.dtls.fairdatapoint.api.dto.resource.*;
-import nl.dtls.fairdatapoint.entity.resource.*;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.api.dto.resource.*;
+import org.fairdatapoint.entity.resource.*;
+import org.fairdatapoint.entity.schema.MetadataSchema;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionService.java b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionService.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionService.java
rename to src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionService.java
index 092cb9f3e..c59ec6dc0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionService.java
+++ b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,24 +20,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.resource;
+package org.fairdatapoint.service.resource;
 
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChildDTO;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
-import nl.dtls.fairdatapoint.database.db.repository.*;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.resource.MetadataSchemaUsage;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionLink;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.service.membership.MembershipService;
-import nl.dtls.fairdatapoint.service.openapi.OpenApiService;
-import nl.dtls.fairdatapoint.service.schema.MetadataSchemaService;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChildDTO;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatapoint.database.db.repository.*;
+import org.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatapoint.entity.resource.MetadataSchemaUsage;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatapoint.entity.resource.ResourceDefinitionLink;
+import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.service.membership.MembershipService;
+import org.fairdatapoint.service.openapi.OpenApiService;
+import org.fairdatapoint.service.schema.MetadataSchemaService;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
rename to src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
index c78506cf8..f0a31bbc9 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
+++ b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.resource;
+package org.fairdatapoint.service.resource;
 
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.database.db.repository.*;
+import org.fairdatapoint.database.db.repository.*;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
 
-import static nl.dtls.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_TARGET_CLASSES_CACHE;
+import static org.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_TARGET_CLASSES_CACHE;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionValidator.java b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionValidator.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionValidator.java
rename to src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionValidator.java
index 625c4f284..7728cdf87 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionValidator.java
+++ b/src/main/java/org/fairdatapoint/service/resource/ResourceDefinitionValidator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.resource;
+package org.fairdatapoint.service.resource;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChildDTO;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChildDTO;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.BindException;
 
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import static nl.dtls.fairdatapoint.util.ValidationUtil.uniquenessValidationFailed;
+import static org.fairdatapoint.util.ValidationUtil.uniquenessValidationFailed;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaMapper.java b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaMapper.java
similarity index 98%
rename from src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaMapper.java
rename to src/main/java/org/fairdatapoint/service/schema/MetadataSchemaMapper.java
index 17b195b8c..3a3ac0a8e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaMapper.java
+++ b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.schema;
+package org.fairdatapoint.service.schema;
 
-import nl.dtls.fairdatapoint.api.dto.schema.*;
-import nl.dtls.fairdatapoint.entity.schema.*;
+import org.fairdatapoint.api.dto.schema.*;
+import org.fairdatapoint.entity.schema.*;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
rename to src/main/java/org/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
index 64600005c..f750569db 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
+++ b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaRetrievalUtils.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.schema;
+package org.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 nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import nl.dtls.fairdatapoint.entity.exception.MetadataSchemaImportException;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatapoint.entity.exception.MetadataSchemaImportException;
 import org.springframework.http.HttpHeaders;
 
 import java.io.IOException;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaService.java b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaService.java
similarity index 97%
rename from src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaService.java
rename to src/main/java/org/fairdatapoint/service/schema/MetadataSchemaService.java
index f0e904200..f5d0a912e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaService.java
+++ b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,23 +20,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.schema;
+package org.fairdatapoint.service.schema;
 
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.schema.*;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaExtensionRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaUsageRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.resource.MetadataSchemaUsage;
-import nl.dtls.fairdatapoint.entity.schema.*;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
+import org.fairdatapoint.api.dto.schema.*;
+import org.fairdatapoint.database.db.repository.MetadataSchemaExtensionRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaUsageRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatapoint.entity.resource.MetadataSchemaUsage;
+import org.fairdatapoint.entity.schema.*;
+import org.fairdatapoint.service.resource.ResourceDefinitionTargetClassesCache;
+import org.fairdatapoint.util.RdfIOUtil;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
rename to src/main/java/org/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
index 0f668fca6..c5079909a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
+++ b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaShaclUtils.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.schema;
+package org.fairdatapoint.service.schema;
 
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
+import org.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 nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 public class MetadataSchemaShaclUtils {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaValidator.java b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaValidator.java
similarity index 87%
rename from src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaValidator.java
rename to src/main/java/org/fairdatapoint/service/schema/MetadataSchemaValidator.java
index f513191d0..6c2f629a0 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaValidator.java
+++ b/src/main/java/org/fairdatapoint/service/schema/MetadataSchemaValidator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.schema;
+package org.fairdatapoint.service.schema;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaExtensionRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaExtension;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaState;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatapoint.database.db.repository.MetadataSchemaExtensionRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.entity.schema.MetadataSchemaExtension;
+import org.fairdatapoint.entity.schema.MetadataSchemaState;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.util.RdfIOUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/search/SearchFilterCache.java b/src/main/java/org/fairdatapoint/service/search/SearchFilterCache.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/search/SearchFilterCache.java
rename to src/main/java/org/fairdatapoint/service/search/SearchFilterCache.java
index ed59628c8..426dafaa1 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/search/SearchFilterCache.java
+++ b/src/main/java/org/fairdatapoint/service/search/SearchFilterCache.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.search;
+package org.fairdatapoint.service.search;
 
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.database.db.repository.SettingsSearchFilterRepository;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterCacheContainer;
-import nl.dtls.fairdatapoint.service.label.LabelService;
-import nl.dtls.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatapoint.database.db.repository.SettingsSearchFilterRepository;
+import org.fairdatapoint.entity.search.SearchFilterCacheContainer;
+import org.fairdatapoint.service.label.LabelService;
+import org.fairdatapoint.service.settings.SettingsCache;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Component;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.config.CacheConfig.SEARCH_FILTERS_CACHE;
+import static org.fairdatapoint.config.CacheConfig.SEARCH_FILTERS_CACHE;
 
 @Component
 @Slf4j
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/search/SearchMapper.java b/src/main/java/org/fairdatapoint/service/search/SearchMapper.java
similarity index 90%
rename from src/main/java/nl/dtls/fairdatapoint/service/search/SearchMapper.java
rename to src/main/java/org/fairdatapoint/service/search/SearchMapper.java
index 9df94ef49..fadded3b2 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/search/SearchMapper.java
+++ b/src/main/java/org/fairdatapoint/service/search/SearchMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.search;
+package org.fairdatapoint.service.search;
 
-import nl.dtls.fairdatapoint.api.dto.search.*;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterValue;
-import nl.dtls.fairdatapoint.entity.search.SearchResult;
-import nl.dtls.fairdatapoint.entity.settings.SettingsSearchFilter;
-import nl.dtls.fairdatapoint.entity.settings.SettingsSearchFilterItem;
+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.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/search/SearchService.java b/src/main/java/org/fairdatapoint/service/search/SearchService.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/search/SearchService.java
rename to src/main/java/org/fairdatapoint/service/search/SearchService.java
index ca652abec..30edb74d3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/search/SearchService.java
+++ b/src/main/java/org/fairdatapoint/service/search/SearchService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.search;
+package org.fairdatapoint.service.search;
 
 import com.google.common.io.Resources;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.search.*;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterCacheContainer;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterType;
-import nl.dtls.fairdatapoint.entity.search.SearchFilterValue;
-import nl.dtls.fairdatapoint.entity.search.SearchResult;
-import nl.dtls.fairdatapoint.entity.settings.SettingsSearchFilter;
-import nl.dtls.fairdatapoint.service.metadata.state.MetadataStateService;
-import nl.dtls.fairdatapoint.service.settings.SettingsService;
+import org.fairdatapoint.api.dto.search.*;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+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.apache.commons.lang.text.StrSubstitutor;
 import org.eclipse.rdf4j.query.MalformedQueryException;
 import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser;
@@ -50,8 +50,8 @@
 
 import static java.lang.String.format;
 import static java.util.stream.Collectors.toList;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.l;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/search/query/SearchSavedQueryMapper.java b/src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
rename to src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
index 19e04157a..82d73cb8a 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
+++ b/src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.search.query;
+package org.fairdatapoint.service.search.query;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQuery;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.user.UserMapper;
+import org.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
+import org.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
+import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.user.UserMapper;
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/search/query/SearchSavedQueryService.java b/src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryService.java
similarity index 88%
rename from src/main/java/nl/dtls/fairdatapoint/service/search/query/SearchSavedQueryService.java
rename to src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryService.java
index 7ca6bebdf..61343cb1c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/search/query/SearchSavedQueryService.java
+++ b/src/main/java/org/fairdatapoint/service/search/query/SearchSavedQueryService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.search.query;
+package org.fairdatapoint.service.search.query;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import nl.dtls.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
-import nl.dtls.fairdatapoint.entity.exception.ForbiddenException;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQuery;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQueryType;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
-import nl.dtls.fairdatapoint.service.user.CurrentUserService;
-import nl.dtls.fairdatapoint.service.user.UserService;
+import org.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
+import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatapoint.database.db.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.UserAccount;
+import org.fairdatapoint.entity.user.UserRole;
+import org.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatapoint.service.user.UserService;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/security/AuthenticationService.java b/src/main/java/org/fairdatapoint/service/security/AuthenticationService.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/service/security/AuthenticationService.java
rename to src/main/java/org/fairdatapoint/service/security/AuthenticationService.java
index 43404f1c9..7926ccab6 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/security/AuthenticationService.java
+++ b/src/main/java/org/fairdatapoint/service/security/AuthenticationService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.security;
+package org.fairdatapoint.service.security;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/security/UserDetailsServiceImpl.java b/src/main/java/org/fairdatapoint/service/security/UserDetailsServiceImpl.java
similarity index 89%
rename from src/main/java/nl/dtls/fairdatapoint/service/security/UserDetailsServiceImpl.java
rename to src/main/java/org/fairdatapoint/service/security/UserDetailsServiceImpl.java
index c8736e864..1f547c78e 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/security/UserDetailsServiceImpl.java
+++ b/src/main/java/org/fairdatapoint/service/security/UserDetailsServiceImpl.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.security;
+package org.fairdatapoint.service.security;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.exception.UnauthorizedException;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.exception.UnauthorizedException;
+import org.fairdatapoint.entity.user.UserAccount;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsCache.java b/src/main/java/org/fairdatapoint/service/settings/SettingsCache.java
similarity index 86%
rename from src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsCache.java
rename to src/main/java/org/fairdatapoint/service/settings/SettingsCache.java
index 64664db99..eb39166cd 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsCache.java
+++ b/src/main/java/org/fairdatapoint/service/settings/SettingsCache.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.settings;
+package org.fairdatapoint.service.settings;
 
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.controller.settings.SettingsDefaults;
-import nl.dtls.fairdatapoint.database.db.repository.SettingsRepository;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.api.controller.settings.SettingsDefaults;
+import org.fairdatapoint.database.db.repository.SettingsRepository;
+import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Service;
 
 import java.util.Optional;
 
-import static nl.dtls.fairdatapoint.config.CacheConfig.SETTINGS_CACHE;
+import static org.fairdatapoint.config.CacheConfig.SETTINGS_CACHE;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsMapper.java b/src/main/java/org/fairdatapoint/service/settings/SettingsMapper.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsMapper.java
rename to src/main/java/org/fairdatapoint/service/settings/SettingsMapper.java
index 9ea5cf3f3..44ba3ee4b 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsMapper.java
+++ b/src/main/java/org/fairdatapoint/service/settings/SettingsMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.settings;
+package org.fairdatapoint.service.settings;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.search.SearchFilterDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchFilterItemDTO;
-import nl.dtls.fairdatapoint.api.dto.settings.*;
-import nl.dtls.fairdatapoint.config.properties.InstanceProperties;
-import nl.dtls.fairdatapoint.config.properties.PingProperties;
-import nl.dtls.fairdatapoint.config.properties.RepositoryConnectionProperties;
-import nl.dtls.fairdatapoint.config.properties.RepositoryProperties;
-import nl.dtls.fairdatapoint.entity.settings.*;
-import nl.dtls.fairdatapoint.service.search.SearchMapper;
+import org.fairdatapoint.api.dto.search.SearchFilterDTO;
+import org.fairdatapoint.api.dto.search.SearchFilterItemDTO;
+import org.fairdatapoint.api.dto.settings.*;
+import org.fairdatapoint.config.properties.InstanceProperties;
+import org.fairdatapoint.config.properties.PingProperties;
+import org.fairdatapoint.config.properties.RepositoryConnectionProperties;
+import org.fairdatapoint.config.properties.RepositoryProperties;
+import org.fairdatapoint.entity.settings.*;
+import org.fairdatapoint.service.search.SearchMapper;
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsService.java b/src/main/java/org/fairdatapoint/service/settings/SettingsService.java
similarity index 87%
rename from src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsService.java
rename to src/main/java/org/fairdatapoint/service/settings/SettingsService.java
index 70651b6c8..774b0659d 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsService.java
+++ b/src/main/java/org/fairdatapoint/service/settings/SettingsService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,23 +20,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.settings;
+package org.fairdatapoint.service.settings;
 
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.controller.settings.SettingsDefaults;
-import nl.dtls.fairdatapoint.api.dto.search.SearchFilterDTO;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsAutocompleteSourceDTO;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsDTO;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsMetricDTO;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
-import nl.dtls.fairdatapoint.database.db.repository.*;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.entity.settings.SettingsAutocompleteSource;
-import nl.dtls.fairdatapoint.entity.settings.SettingsMetric;
-import nl.dtls.fairdatapoint.entity.settings.SettingsSearchFilter;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.api.controller.settings.SettingsDefaults;
+import org.fairdatapoint.api.dto.search.SearchFilterDTO;
+import org.fairdatapoint.api.dto.settings.SettingsAutocompleteSourceDTO;
+import org.fairdatapoint.api.dto.settings.SettingsDTO;
+import org.fairdatapoint.api.dto.settings.SettingsMetricDTO;
+import org.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
+import org.fairdatapoint.database.db.repository.*;
+import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatapoint.entity.settings.SettingsAutocompleteSource;
+import org.fairdatapoint.entity.settings.SettingsMetric;
+import org.fairdatapoint.entity.settings.SettingsSearchFilter;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/user/CurrentUserService.java b/src/main/java/org/fairdatapoint/service/user/CurrentUserService.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/service/user/CurrentUserService.java
rename to src/main/java/org/fairdatapoint/service/user/CurrentUserService.java
index 5842f22ed..f9fe9d64c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/user/CurrentUserService.java
+++ b/src/main/java/org/fairdatapoint/service/user/CurrentUserService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.user;
+package org.fairdatapoint.service.user;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/user/UserMapper.java b/src/main/java/org/fairdatapoint/service/user/UserMapper.java
similarity index 95%
rename from src/main/java/nl/dtls/fairdatapoint/service/user/UserMapper.java
rename to src/main/java/org/fairdatapoint/service/user/UserMapper.java
index 6fbc3676c..f768226cc 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/user/UserMapper.java
+++ b/src/main/java/org/fairdatapoint/service/user/UserMapper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.user;
+package org.fairdatapoint.service.user;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.user.*;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.api.dto.user.*;
+import org.fairdatapoint.entity.user.UserAccount;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/user/UserService.java b/src/main/java/org/fairdatapoint/service/user/UserService.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/service/user/UserService.java
rename to src/main/java/org/fairdatapoint/service/user/UserService.java
index a88571ef9..d9101b5e3 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/user/UserService.java
+++ b/src/main/java/org/fairdatapoint/service/user/UserService.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.user;
+package org.fairdatapoint.service.user;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.user.*;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberService;
+import org.fairdatapoint.api.dto.user.*;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/nl/dtls/fairdatapoint/service/user/UserValidator.java b/src/main/java/org/fairdatapoint/service/user/UserValidator.java
similarity index 87%
rename from src/main/java/nl/dtls/fairdatapoint/service/user/UserValidator.java
rename to src/main/java/org/fairdatapoint/service/user/UserValidator.java
index e17ed4274..2f1b89b36 100644
--- a/src/main/java/nl/dtls/fairdatapoint/service/user/UserValidator.java
+++ b/src/main/java/org/fairdatapoint/service/user/UserValidator.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.user;
+package org.fairdatapoint.service.user;
 
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatapoint.entity.user.UserAccount;
 import org.springframework.stereotype.Service;
 
 import java.util.Optional;
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/HttpUtil.java b/src/main/java/org/fairdatapoint/util/HttpUtil.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/util/HttpUtil.java
rename to src/main/java/org/fairdatapoint/util/HttpUtil.java
index 0210134e1..daa5c6216 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/HttpUtil.java
+++ b/src/main/java/org/fairdatapoint/util/HttpUtil.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
+import org.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 nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Slf4j
 public class HttpUtil {
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/KnownUUIDs.java b/src/main/java/org/fairdatapoint/util/KnownUUIDs.java
similarity index 98%
rename from src/main/java/nl/dtls/fairdatapoint/util/KnownUUIDs.java
rename to src/main/java/org/fairdatapoint/util/KnownUUIDs.java
index dedb08a16..844332736 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/KnownUUIDs.java
+++ b/src/main/java/org/fairdatapoint/util/KnownUUIDs.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
 import java.util.UUID;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/RdfIOUtil.java b/src/main/java/org/fairdatapoint/util/RdfIOUtil.java
similarity index 92%
rename from src/main/java/nl/dtls/fairdatapoint/util/RdfIOUtil.java
rename to src/main/java/org/fairdatapoint/util/RdfIOUtil.java
index 16870ff97..829efb152 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/RdfIOUtil.java
+++ b/src/main/java/org/fairdatapoint/util/RdfIOUtil.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
+import org.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 nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.setRdfTypes;
-import static nl.dtls.fairdatapoint.util.RdfUtil.getSubjectBy;
-import static nl.dtls.fairdatapoint.util.ResourceReader.getResource;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.s;
+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;
 
 public class RdfIOUtil {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/RdfUtil.java b/src/main/java/org/fairdatapoint/util/RdfUtil.java
similarity index 97%
rename from src/main/java/nl/dtls/fairdatapoint/util/RdfUtil.java
rename to src/main/java/org/fairdatapoint/util/RdfUtil.java
index 79968fe86..cd4c5b454 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/RdfUtil.java
+++ b/src/main/java/org/fairdatapoint/util/RdfUtil.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
 import org.eclipse.rdf4j.model.*;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 public class RdfUtil {
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/ResourceReader.java b/src/main/java/org/fairdatapoint/util/ResourceReader.java
similarity index 97%
rename from src/main/java/nl/dtls/fairdatapoint/util/ResourceReader.java
rename to src/main/java/org/fairdatapoint/util/ResourceReader.java
index b0b42b4fe..dfb0655fb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/ResourceReader.java
+++ b/src/main/java/org/fairdatapoint/util/ResourceReader.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/ThrowingFunction.java b/src/main/java/org/fairdatapoint/util/ThrowingFunction.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/util/ThrowingFunction.java
rename to src/main/java/org/fairdatapoint/util/ThrowingFunction.java
index 3cf9598f5..b3c065cf1 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/ThrowingFunction.java
+++ b/src/main/java/org/fairdatapoint/util/ThrowingFunction.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/TimeUtils.java b/src/main/java/org/fairdatapoint/util/TimeUtils.java
similarity index 94%
rename from src/main/java/nl/dtls/fairdatapoint/util/TimeUtils.java
rename to src/main/java/org/fairdatapoint/util/TimeUtils.java
index e787e16fa..c762e2854 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/TimeUtils.java
+++ b/src/main/java/org/fairdatapoint/util/TimeUtils.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
 import java.sql.Timestamp;
 import java.time.Instant;
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/ValidationUtil.java b/src/main/java/org/fairdatapoint/util/ValidationUtil.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/util/ValidationUtil.java
rename to src/main/java/org/fairdatapoint/util/ValidationUtil.java
index 00ae7874a..6766a8e47 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/ValidationUtil.java
+++ b/src/main/java/org/fairdatapoint/util/ValidationUtil.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindException;
diff --git a/src/main/java/nl/dtls/fairdatapoint/util/ValueFactoryHelper.java b/src/main/java/org/fairdatapoint/util/ValueFactoryHelper.java
similarity index 98%
rename from src/main/java/nl/dtls/fairdatapoint/util/ValueFactoryHelper.java
rename to src/main/java/org/fairdatapoint/util/ValueFactoryHelper.java
index 6b295e4b8..e875b2010 100644
--- a/src/main/java/nl/dtls/fairdatapoint/util/ValueFactoryHelper.java
+++ b/src/main/java/org/fairdatapoint/util/ValueFactoryHelper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.util;
+package org.fairdatapoint.util;
 
 import org.eclipse.rdf4j.model.*;
 import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
diff --git a/src/main/java/nl/dtls/fairdatapoint/vocabulary/DCAT3.java b/src/main/java/org/fairdatapoint/vocabulary/DCAT3.java
similarity index 91%
rename from src/main/java/nl/dtls/fairdatapoint/vocabulary/DCAT3.java
rename to src/main/java/org/fairdatapoint/vocabulary/DCAT3.java
index fa241011e..20432b3b1 100644
--- a/src/main/java/nl/dtls/fairdatapoint/vocabulary/DCAT3.java
+++ b/src/main/java/org/fairdatapoint/vocabulary/DCAT3.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.vocabulary;
+package org.fairdatapoint.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.vocabulary.DCAT;
 
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 /**
  * Temporary solution for DCAT3 which currently not supported in RDR4J vocabularies
diff --git a/src/main/java/nl/dtls/fairdatapoint/vocabulary/Sio.java b/src/main/java/org/fairdatapoint/vocabulary/Sio.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/vocabulary/Sio.java
rename to src/main/java/org/fairdatapoint/vocabulary/Sio.java
index df1493856..b5caafeeb 100644
--- a/src/main/java/nl/dtls/fairdatapoint/vocabulary/Sio.java
+++ b/src/main/java/org/fairdatapoint/vocabulary/Sio.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.vocabulary;
+package org.fairdatapoint.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.ValueFactory;
diff --git a/src/main/java/nl/dtls/fairdatapoint/vocabulary/WebAccessControl.java b/src/main/java/org/fairdatapoint/vocabulary/WebAccessControl.java
similarity index 96%
rename from src/main/java/nl/dtls/fairdatapoint/vocabulary/WebAccessControl.java
rename to src/main/java/org/fairdatapoint/vocabulary/WebAccessControl.java
index 186253577..fbd80978c 100644
--- a/src/main/java/nl/dtls/fairdatapoint/vocabulary/WebAccessControl.java
+++ b/src/main/java/org/fairdatapoint/vocabulary/WebAccessControl.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.vocabulary;
+package org.fairdatapoint.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.ValueFactory;
diff --git a/src/main/resources/db/migration/V0001.0__init-fdp-db.sql b/src/main/resources/db/migration/V0001.0__init-fdp-db.sql
index e3dda3e29..c411d0586 100644
--- a/src/main/resources/db/migration/V0001.0__init-fdp-db.sql
+++ b/src/main/resources/db/migration/V0001.0__init-fdp-db.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/resources/dev/db/migration/V0001.1__dev-data-users.sql b/src/main/resources/dev/db/migration/V0001.1__dev-data-users.sql
index f36291a59..998d05ade 100644
--- a/src/main/resources/dev/db/migration/V0001.1__dev-data-users.sql
+++ b/src/main/resources/dev/db/migration/V0001.1__dev-data-users.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/resources/dev/db/migration/V0001.2__dev-data-schemas.sql b/src/main/resources/dev/db/migration/V0001.2__dev-data-schemas.sql
index 78c141f8c..310c8377f 100644
--- a/src/main/resources/dev/db/migration/V0001.2__dev-data-schemas.sql
+++ b/src/main/resources/dev/db/migration/V0001.2__dev-data-schemas.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/resources/dev/db/migration/V0001.3__dev-data-rds.sql b/src/main/resources/dev/db/migration/V0001.3__dev-data-rds.sql
index 29eb20aeb..ed4f047ff 100644
--- a/src/main/resources/dev/db/migration/V0001.3__dev-data-rds.sql
+++ b/src/main/resources/dev/db/migration/V0001.3__dev-data-rds.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/resources/dev/db/migration/V0001.4__dev-data-membership.sql b/src/main/resources/dev/db/migration/V0001.4__dev-data-membership.sql
index 9e699a971..8240e0bfe 100644
--- a/src/main/resources/dev/db/migration/V0001.4__dev-data-membership.sql
+++ b/src/main/resources/dev/db/migration/V0001.4__dev-data-membership.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/resources/dev/db/migration/V0001.5__dev-settings.sql b/src/main/resources/dev/db/migration/V0001.5__dev-settings.sql
index f6df63825..75496e02a 100644
--- a/src/main/resources/dev/db/migration/V0001.5__dev-settings.sql
+++ b/src/main/resources/dev/db/migration/V0001.5__dev-settings.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-catalog.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-catalog.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-catalog.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-catalog.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-custom-edited.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-custom-edited.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-custom-edited.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-custom-edited.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-custom.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-custom.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-custom.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-custom.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-data-service.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-data-service.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-data-service.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-data-service.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-dataset.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-dataset.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-dataset.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-dataset.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-distribution.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-distribution.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-distribution.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-distribution.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-fdp.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-fdp.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-fdp.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-fdp.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-metadata-service.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-metadata-service.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-metadata-service.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-metadata-service.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-resource.ttl b/src/main/resources/org/fairdatapoint/database/fixtures/shape-resource.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/fixtures/shape-resource.ttl
rename to src/main/resources/org/fairdatapoint/database/fixtures/shape-resource.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/rdf/repository/catalog/getDatasetThemesForCatalog.sparql b/src/main/resources/org/fairdatapoint/database/rdf/repository/catalog/getDatasetThemesForCatalog.sparql
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/rdf/repository/catalog/getDatasetThemesForCatalog.sparql
rename to src/main/resources/org/fairdatapoint/database/rdf/repository/catalog/getDatasetThemesForCatalog.sparql
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/rdf/repository/common/findChildTitles.sparql b/src/main/resources/org/fairdatapoint/database/rdf/repository/common/findChildTitles.sparql
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/rdf/repository/common/findChildTitles.sparql
rename to src/main/resources/org/fairdatapoint/database/rdf/repository/common/findChildTitles.sparql
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/rdf/repository/common/findEntityByLiteral.sparql b/src/main/resources/org/fairdatapoint/database/rdf/repository/common/findEntityByLiteral.sparql
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/rdf/repository/common/findEntityByLiteral.sparql
rename to src/main/resources/org/fairdatapoint/database/rdf/repository/common/findEntityByLiteral.sparql
diff --git a/src/main/resources/nl/dtls/fairdatapoint/database/rdf/repository/common/findObjectsForPredicate.sparql b/src/main/resources/org/fairdatapoint/database/rdf/repository/common/findObjectsForPredicate.sparql
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/database/rdf/repository/common/findObjectsForPredicate.sparql
rename to src/main/resources/org/fairdatapoint/database/rdf/repository/common/findObjectsForPredicate.sparql
diff --git a/src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-catalog.ttl b/src/main/resources/org/fairdatapoint/service/reset/shape-catalog.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-catalog.ttl
rename to src/main/resources/org/fairdatapoint/service/reset/shape-catalog.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-data-service.ttl b/src/main/resources/org/fairdatapoint/service/reset/shape-data-service.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-data-service.ttl
rename to src/main/resources/org/fairdatapoint/service/reset/shape-data-service.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-dataset.ttl b/src/main/resources/org/fairdatapoint/service/reset/shape-dataset.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-dataset.ttl
rename to src/main/resources/org/fairdatapoint/service/reset/shape-dataset.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-distribution.ttl b/src/main/resources/org/fairdatapoint/service/reset/shape-distribution.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-distribution.ttl
rename to src/main/resources/org/fairdatapoint/service/reset/shape-distribution.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-fdp.ttl b/src/main/resources/org/fairdatapoint/service/reset/shape-fdp.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-fdp.ttl
rename to src/main/resources/org/fairdatapoint/service/reset/shape-fdp.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-metadata-service.ttl b/src/main/resources/org/fairdatapoint/service/reset/shape-metadata-service.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-metadata-service.ttl
rename to src/main/resources/org/fairdatapoint/service/reset/shape-metadata-service.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-resource.ttl b/src/main/resources/org/fairdatapoint/service/reset/shape-resource.ttl
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/service/reset/shape-resource.ttl
rename to src/main/resources/org/fairdatapoint/service/reset/shape-resource.ttl
diff --git a/src/main/resources/nl/dtls/fairdatapoint/service/search/queryTemplate.sparql b/src/main/resources/org/fairdatapoint/service/search/queryTemplate.sparql
similarity index 100%
rename from src/main/resources/nl/dtls/fairdatapoint/service/search/queryTemplate.sparql
rename to src/main/resources/org/fairdatapoint/service/search/queryTemplate.sparql
diff --git a/src/test/java/nl/dtls/fairdatapoint/BaseIntegrationTest.java b/src/test/java/org/fairdatapoint/BaseIntegrationTest.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/BaseIntegrationTest.java
rename to src/test/java/org/fairdatapoint/BaseIntegrationTest.java
index af5203646..00f1f96d6 100644
--- a/src/test/java/nl/dtls/fairdatapoint/BaseIntegrationTest.java
+++ b/src/test/java/org/fairdatapoint/BaseIntegrationTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint;
+package org.fairdatapoint;
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/nl/dtls/fairdatapoint/WebIntegrationTest.java b/src/test/java/org/fairdatapoint/WebIntegrationTest.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/WebIntegrationTest.java
rename to src/test/java/org/fairdatapoint/WebIntegrationTest.java
index 4b51cf2e8..6fe2e758a 100644
--- a/src/test/java/nl/dtls/fairdatapoint/WebIntegrationTest.java
+++ b/src/test/java/org/fairdatapoint/WebIntegrationTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint;
+package org.fairdatapoint;
 
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.AclMigration;
+import org.fairdatapoint.database.rdf.migration.development.metadata.AclMigration;
 import org.flywaydb.core.Flyway;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java b/src/test/java/org/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
rename to src/test/java/org/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
index dc179735d..3438ae85b 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
+++ b/src/test/java/org/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.actuator;
+package org.fairdatapoint.acceptance.actuator;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.validation.constraints.NotBlank;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/List_Info_GET.java b/src/test/java/org/fairdatapoint/acceptance/actuator/List_Info_GET.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/List_Info_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/actuator/List_Info_GET.java
index 2b17817ed..40403fdaf 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/List_Info_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/actuator/List_Info_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.actuator;
+package org.fairdatapoint.acceptance.actuator;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/apikey/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/apikey/Detail_DELETE.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/apikey/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/apikey/Detail_DELETE.java
index ebd08e186..020d3678a 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/apikey/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/apikey/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.apikey;
+package org.fairdatapoint.acceptance.apikey;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.ApiKeyRepository;
-import nl.dtls.fairdatapoint.entity.apikey.ApiKey;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.ApiKeyRepository;
+import org.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/apikey/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/apikey/List_GET.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/apikey/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/apikey/List_GET.java
index be64bafdc..22147859d 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/apikey/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/apikey/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.apikey;
+package org.fairdatapoint.acceptance.apikey;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -35,7 +35,7 @@
 import java.net.URI;
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/apikey/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/apikey/List_POST.java
similarity index 89%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/apikey/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/apikey/List_POST.java
index c313892af..b84537ed2 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/apikey/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/apikey/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.apikey;
+package org.fairdatapoint.acceptance.apikey;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.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/nl/dtls/fairdatapoint/acceptance/common/ForbiddenTest.java b/src/test/java/org/fairdatapoint/acceptance/common/ForbiddenTest.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/common/ForbiddenTest.java
rename to src/test/java/org/fairdatapoint/acceptance/common/ForbiddenTest.java
index 6baf8ab73..f3386dda7 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/common/ForbiddenTest.java
+++ b/src/test/java/org/fairdatapoint/acceptance/common/ForbiddenTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.common;
+package org.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 nl.dtls.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
+import static org.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/nl/dtls/fairdatapoint/acceptance/common/NotFoundTest.java b/src/test/java/org/fairdatapoint/acceptance/common/NotFoundTest.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/common/NotFoundTest.java
rename to src/test/java/org/fairdatapoint/acceptance/common/NotFoundTest.java
index 1e27345f4..8829b07ff 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/common/NotFoundTest.java
+++ b/src/test/java/org/fairdatapoint/acceptance/common/NotFoundTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.common;
+package org.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 nl.dtls.fairdatapoint.WebIntegrationTest.ADMIN_TOKEN;
-import static nl.dtls.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
+import static org.fairdatapoint.WebIntegrationTest.ADMIN_TOKEN;
+import static org.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/nl/dtls/fairdatapoint/acceptance/config/List_Bootstrap_GET.java b/src/test/java/org/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
index 752526ee0..1603ebcd7 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/config/List_Bootstrap_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.config;
+package org.fairdatapoint.acceptance.config;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.config.BootstrapConfigDTO;
+import org.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/dashboard/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/dashboard/List_GET.java
similarity index 89%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/dashboard/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/dashboard/List_GET.java
index 07ad52ea1..ed0fb0ecc 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/dashboard/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/dashboard/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.dashboard;
+package org.fairdatapoint.acceptance.dashboard;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
-import nl.dtls.fairdatapoint.entity.metadata.Metadata;
-import nl.dtls.fairdatapoint.service.member.MemberService;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
+import org.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatapoint.service.member.MemberService;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/general/ContentNegotiationTest.java b/src/test/java/org/fairdatapoint/acceptance/general/ContentNegotiationTest.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/general/ContentNegotiationTest.java
rename to src/test/java/org/fairdatapoint/acceptance/general/ContentNegotiationTest.java
index 4177e78ff..4c63921d1 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/general/ContentNegotiationTest.java
+++ b/src/test/java/org/fairdatapoint/acceptance/general/ContentNegotiationTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.general;
+package org.fairdatapoint.acceptance.general;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.WebIntegrationTest;
 import org.apache.http.HttpHeaders;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/general/SecurityTest.java b/src/test/java/org/fairdatapoint/acceptance/general/SecurityTest.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/general/SecurityTest.java
rename to src/test/java/org/fairdatapoint/acceptance/general/SecurityTest.java
index 5d56da544..dad2bfbed 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/general/SecurityTest.java
+++ b/src/test/java/org/fairdatapoint/acceptance/general/SecurityTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.general;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.ApiKeyRepository;
-import nl.dtls.fairdatapoint.entity.apikey.ApiKey;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+package org.fairdatapoint.acceptance.general;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.ApiKeyRepository;
+import org.fairdatapoint.entity.apikey.ApiKey;
+import org.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.util.RdfIOUtil;
+import org.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/nl/dtls/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java b/src/test/java/org/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
index 3252a8cff..556a58af6 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/admin/List_TriggerAll_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.admin;
+package org.fairdatapoint.acceptance.index.admin;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEntryRepository;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEventRepository;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEventType;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.IndexEntryRepository;
+import org.fairdatapoint.database.db.repository.IndexEventRepository;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.entity.index.event.IndexEventType;
 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/nl/dtls/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/org/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
index c2778a467..f9bb9321e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.admin;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEntryRepository;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEventRepository;
-import nl.dtls.fairdatapoint.database.db.repository.IndexSettingsRepository;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEventType;
-import nl.dtls.fairdatapoint.utils.TestIndexEntryFixtures;
+package org.fairdatapoint.acceptance.index.admin;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.db.repository.IndexEntryRepository;
+import org.fairdatapoint.database.db.repository.IndexEventRepository;
+import org.fairdatapoint.database.db.repository.IndexSettingsRepository;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.entity.index.event.IndexEventType;
+import org.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/nl/dtls/fairdatapoint/acceptance/index/entry/List_All_GET.java b/src/test/java/org/fairdatapoint/acceptance/index/entry/List_All_GET.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/entry/List_All_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/index/entry/List_All_GET.java
index ae7fa1abf..bb4fb1a1e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/entry/List_All_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/entry/List_All_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.entry;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEntryRepository;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
-import nl.dtls.fairdatapoint.utils.TestIndexEntryFixtures;
+package org.fairdatapoint.acceptance.index.entry;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
+import org.fairdatapoint.database.db.repository.IndexEntryRepository;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.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/nl/dtls/fairdatapoint/acceptance/index/entry/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/index/entry/List_GET.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/entry/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/index/entry/List_GET.java
index d3a16968d..07f1235f8 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/entry/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/entry/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.entry;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEntryRepository;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
-import nl.dtls.fairdatapoint.utils.CustomPageImpl;
-import nl.dtls.fairdatapoint.utils.TestIndexEntryFixtures;
+package org.fairdatapoint.acceptance.index.entry;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
+import org.fairdatapoint.database.db.repository.IndexEntryRepository;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.fairdatapoint.utils.CustomPageImpl;
+import org.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/nl/dtls/fairdatapoint/acceptance/index/entry/List_Info_GET.java b/src/test/java/org/fairdatapoint/acceptance/index/entry/List_Info_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/entry/List_Info_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/index/entry/List_Info_GET.java
index 8853e5242..fa38b25ee 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/entry/List_Info_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/entry/List_Info_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.entry;
+package org.fairdatapoint.acceptance.index.entry;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEntryRepository;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.utils.TestIndexEntryFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
+import org.fairdatapoint.database.db.repository.IndexEntryRepository;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.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/nl/dtls/fairdatapoint/acceptance/index/ping/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/index/ping/List_POST.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/ping/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/index/ping/List_POST.java
index 1a2988a8d..8096c1f62 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/ping/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/ping/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.ping;
+package org.fairdatapoint.acceptance.index.ping;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexEntryRepository;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.utils.TestIndexEntryFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.db.repository.IndexEntryRepository;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.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/nl/dtls/fairdatapoint/acceptance/index/settings/List_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/index/settings/List_DELETE.java
similarity index 93%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/settings/List_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/index/settings/List_DELETE.java
index c548a08e2..2924ad7bf 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/settings/List_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/settings/List_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.settings;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexSettingsRepository;
-import nl.dtls.fairdatapoint.entity.index.settings.IndexSettings;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexPing;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
-import nl.dtls.fairdatapoint.service.index.settings.IndexSettingsDefaults;
+package org.fairdatapoint.acceptance.index.settings;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatapoint.database.db.repository.IndexSettingsRepository;
+import org.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatapoint.entity.index.settings.SettingsIndexPing;
+import org.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
+import org.fairdatapoint.service.index.settings.IndexSettingsDefaults;
 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/nl/dtls/fairdatapoint/acceptance/index/settings/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/index/settings/List_GET.java
similarity index 93%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/settings/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/index/settings/List_GET.java
index bb9957080..9fef70f00 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/settings/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/settings/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.settings;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexSettingsRepository;
-import nl.dtls.fairdatapoint.entity.index.settings.IndexSettings;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexPing;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
-import nl.dtls.fairdatapoint.service.index.settings.IndexSettingsDefaults;
+package org.fairdatapoint.acceptance.index.settings;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatapoint.database.db.repository.IndexSettingsRepository;
+import org.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatapoint.entity.index.settings.SettingsIndexPing;
+import org.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
+import org.fairdatapoint.service.index.settings.IndexSettingsDefaults;
 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/nl/dtls/fairdatapoint/acceptance/index/settings/List_PUT.java b/src/test/java/org/fairdatapoint/acceptance/index/settings/List_PUT.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/index/settings/List_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/index/settings/List_PUT.java
index dc71e500d..7a3d0feed 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/settings/List_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/index/settings/List_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.index.settings;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsPingDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsRetrievalDTO;
-import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import nl.dtls.fairdatapoint.database.db.repository.IndexSettingsRepository;
-import nl.dtls.fairdatapoint.entity.index.settings.IndexSettings;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexPing;
-import nl.dtls.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
-import nl.dtls.fairdatapoint.service.index.settings.IndexSettingsDefaults;
+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.db.repository.IndexSettingsRepository;
+import org.fairdatapoint.entity.index.settings.IndexSettings;
+import org.fairdatapoint.entity.index.settings.SettingsIndexPing;
+import org.fairdatapoint.entity.index.settings.SettingsIndexRetrieval;
+import org.fairdatapoint.service.index.settings.IndexSettingsDefaults;
 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/nl/dtls/fairdatapoint/acceptance/membership/Common.java b/src/test/java/org/fairdatapoint/acceptance/membership/Common.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/membership/Common.java
rename to src/test/java/org/fairdatapoint/acceptance/membership/Common.java
index 57e697c65..c71885267 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/membership/Common.java
+++ b/src/test/java/org/fairdatapoint/acceptance/membership/Common.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.membership;
+package org.fairdatapoint.acceptance.membership;
 
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipDTO;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatapoint.entity.membership.Membership;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/membership/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/membership/List_GET.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/membership/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/membership/List_GET.java
index 676510cfe..1f7b2d098 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/membership/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/membership/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.membership;
+package org.fairdatapoint.acceptance.membership;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.membership.MembershipDTO;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
@@ -34,7 +34,7 @@
 import java.net.URI;
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/Common.java b/src/test/java/org/fairdatapoint/acceptance/metadata/Common.java
similarity index 89%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/Common.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/Common.java
index a9f0deea5..2ba6298d3 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/Common.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/Common.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata;
+package org.fairdatapoint.acceptance.metadata;
 
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+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.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 nl.dtls.fairdatapoint.WebIntegrationTest.ALBERT_TOKEN;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/SingpostingTest.java b/src/test/java/org/fairdatapoint/acceptance/metadata/SingpostingTest.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/SingpostingTest.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/SingpostingTest.java
index 7d77cf252..918168be0 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/SingpostingTest.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/SingpostingTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata;
+package org.fairdatapoint.acceptance.metadata;
 
 import static java.lang.String.format;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIn.in;
 import static org.hamcrest.core.Is.is;
 import java.net.URI;
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.WebIntegrationTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
similarity index 93%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
index d8619ad8e..7835d7930 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatapoint.acceptance.metadata.catalog;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
index 6d06dcd5c..daf677d85 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Expanded_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatapoint.acceptance.metadata.catalog;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
index 1a402a30d..345fc3594 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatapoint.acceptance.metadata.catalog;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
index 0d7c8c749..9d3c57a5e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatapoint.acceptance.metadata.catalog;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.RdfIOUtil;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -41,12 +41,12 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
index be6da9dd2..fa6b671c5 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/Detail_Page_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatapoint.acceptance.metadata.catalog;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/catalog/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/List_POST.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/List_POST.java
index b2c9f2c6f..be9e1919f 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog;
+package org.fairdatapoint.acceptance.metadata.catalog;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.RdfIOUtil;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.junit.jupiter.api.DisplayName;
@@ -39,7 +39,7 @@
 
 import java.net.URI;
 
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
similarity index 92%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
index d577907cb..d79428e5a 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog.member;
+package org.fairdatapoint.acceptance.metadata.catalog.member;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -35,7 +35,7 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
similarity index 86%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
index 0ca3578b7..ba7d66f95 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog.member;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberCreateDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +42,7 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
similarity index 86%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
index 96111cff2..2eeba7bbb 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/member/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog.member;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +44,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
similarity index 81%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
index b0452e63b..f376013f4 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog.meta;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,9 +47,9 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
similarity index 83%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
index 725d3457e..3ff11e887 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/catalog/meta/List_State_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.catalog.meta;
+package org.fairdatapoint.acceptance.metadata.catalog.meta;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatapoint.entity.metadata.MetadataState;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +40,10 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
similarity index 93%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
index 84d23aabd..f6428a39f 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatapoint.acceptance.metadata.dataset;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
index 03c2ec0f8..b74221c93 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Expanded_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatapoint.acceptance.metadata.dataset;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
index 97129b1b5..4bc0f7e7c 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatapoint.acceptance.metadata.dataset;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
index da9c08ef4..d503f089e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatapoint.acceptance.metadata.dataset;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.RdfIOUtil;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -41,12 +41,12 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
index e61e0ce39..3783a8a82 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/Detail_Page_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatapoint.acceptance.metadata.dataset;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/List_POST.java
similarity index 89%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/List_POST.java
index 9d0ce47f6..55721832f 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset;
+package org.fairdatapoint.acceptance.metadata.dataset;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.RdfIOUtil;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
similarity index 92%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
index 014db2016..d38955c1c 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset.member;
+package org.fairdatapoint.acceptance.metadata.dataset.member;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -36,7 +36,7 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
similarity index 86%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
index d0e83069c..919bd04c5 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset.member;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberCreateDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +42,7 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
index 341473214..181f7272b 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/member/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset.member;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +44,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
similarity index 81%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
index 6ee188a7f..c7e70bacc 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset.meta;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,9 +47,9 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
similarity index 83%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
index 447d52434..40037bcdc 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/dataset/meta/List_State_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.dataset.meta;
+package org.fairdatapoint.acceptance.metadata.dataset.meta;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatapoint.entity.metadata.MetadataState;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +40,10 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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.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/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
similarity index 93%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
index c2897fbd7..08acb1362 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatapoint.acceptance.metadata.distribution;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
index 6c9471bde..6eef29001 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_Expanded_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatapoint.acceptance.metadata.distribution;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
index 3057134f5..fad5bc6cc 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatapoint.acceptance.metadata.distribution;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
index 138c1ab05..13b117e24 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatapoint.acceptance.metadata.distribution;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.RdfIOUtil;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -40,12 +40,12 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/List_POST.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/List_POST.java
index 52f9b8c1b..d3d9f1b78 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution;
+package org.fairdatapoint.acceptance.metadata.distribution;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.RdfIOUtil;
+import org.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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
similarity index 92%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
index 3e78eb6d9..24113ab61 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution.member;
+package org.fairdatapoint.acceptance.metadata.distribution.member;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -36,7 +36,7 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestDelete;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
index ff98c6683..011da0c67 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution.member;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberCreateDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +42,7 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestPut;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
index fa348e631..2486bb97b 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/member/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution.member;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +44,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
similarity index 80%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
index c113b5c91..c8443531e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution.meta;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MembershipRepository;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.membership.Membership;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.service.member.MemberMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MembershipRepository;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.membership.Membership;
+import org.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.service.member.MemberMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,9 +46,9 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGetRDF;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
similarity index 83%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
index dea84b493..4315d591a 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/distribution/meta/List_State_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.distribution.meta;
+package org.fairdatapoint.acceptance.metadata.distribution.meta;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatapoint.entity.metadata.MetadataState;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +40,10 @@
 import java.net.URI;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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.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/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
index a4b19d401..fb2de222b 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatapoint.acceptance.metadata.repository;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
index 57a7fbe0a..f7addc51f 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Expanded_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatapoint.acceptance.metadata.repository;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
index b9a4a3b22..80a88222b 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatapoint.acceptance.metadata.repository;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_POST.java b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
index 712bca794..a6accb764 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatapoint.acceptance.metadata.repository;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
index c41029e7d..ce5ab290e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatapoint.acceptance.metadata.repository;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.util.RdfIOUtil;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.util.RdfIOUtil;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -39,11 +39,11 @@
 
 import java.net.URI;
 
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.l;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
index c2bf9e90b..28c2a5b08 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/Detail_Page_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.repository;
+package org.fairdatapoint.acceptance.metadata.repository;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
similarity index 88%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
index c2c394cdb..8c8228a80 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.repository.meta;
+package org.fairdatapoint.acceptance.metadata.repository.meta;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaDTO;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateDTO;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.metadata.MetaDTO;
+import org.fairdatapoint.api.dto.metadata.MetaStateDTO;
+import org.fairdatapoint.entity.metadata.MetadataState;
 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 java.util.Map;
 
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.assertEmptyState;
+import static org.fairdatapoint.acceptance.metadata.Common.assertEmptyMember;
+import static org.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/nl/dtls/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
similarity index 82%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
index 509aa86c1..c27a0da24 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/metadata/repository/meta/List_State_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.metadata.repository.meta;
+package org.fairdatapoint.acceptance.metadata.repository.meta;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.metadata.MetaStateChangeDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatapoint.entity.metadata.MetadataState;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,10 +39,10 @@
 
 import java.net.URI;
 
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.createMetadataStateAlreadyPublished;
-import static nl.dtls.fairdatapoint.acceptance.metadata.Common.createMetadataStateChangeToDraft;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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.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/nl/dtls/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java b/src/test/java/org/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
index 220f80049..4aefcd4fe 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/openapi/OpenApiDocs_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.openapi;
+package org.fairdatapoint.acceptance.openapi;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java b/src/test/java/org/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
index c0b1cdffa..62d7644ea 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/openapi/SwaggerUI_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.openapi;
+package org.fairdatapoint.acceptance.openapi;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/resource/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/resource/Detail_DELETE.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/resource/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/resource/Detail_DELETE.java
index 56e5d7948..2d7e4fdd4 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/resource/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/resource/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.resource;
+package org.fairdatapoint.acceptance.resource;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.util.KnownUUIDs;
 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.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
+import static org.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/nl/dtls/fairdatapoint/acceptance/resource/Detail_GET.java b/src/test/java/org/fairdatapoint/acceptance/resource/Detail_GET.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/resource/Detail_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/resource/Detail_GET.java
index 21fdc8fb3..febf2a065 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/resource/Detail_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/resource/Detail_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.resource;
+package org.fairdatapoint.acceptance.resource;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/resource/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/resource/Detail_PUT.java
similarity index 84%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/resource/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/resource/Detail_PUT.java
index a0f090e34..30430b921 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/resource/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/resource/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.resource;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+package org.fairdatapoint.acceptance.resource;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.service.resource.ResourceDefinitionMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/resource/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/resource/List_GET.java
similarity index 92%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/resource/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/resource/List_GET.java
index c6310783c..5a4347092 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/resource/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/resource/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.resource;
+package org.fairdatapoint.acceptance.resource;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/resource/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/resource/List_POST.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/resource/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/resource/List_POST.java
index 76a35f743..9a8a79d60 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/resource/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/resource/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.resource;
+package org.fairdatapoint.acceptance.resource;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.service.resource.ResourceDefinitionMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 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 static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
+import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.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/nl/dtls/fairdatapoint/acceptance/schema/Common.java b/src/test/java/org/fairdatapoint/acceptance/schema/Common.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Common.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Common.java
index 03fb52ae6..8c0ea3831 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Common.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Common.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
-
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
+package org.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.MetadataSchemaVersion;
 
 import java.util.UUID;
 
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Content_GET.java b/src/test/java/org/fairdatapoint/acceptance/schema/Content_GET.java
similarity index 89%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Content_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Content_GET.java
index 3bbba00e2..17e02c088 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Content_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Content_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.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/nl/dtls/fairdatapoint/acceptance/schema/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/schema/Detail_DELETE.java
similarity index 89%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Detail_DELETE.java
index e5af44a74..17c6218c1 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatapoint.database.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+import static org.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
+import static org.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/nl/dtls/fairdatapoint/acceptance/schema/Detail_GET.java b/src/test/java/org/fairdatapoint/acceptance/schema/Detail_GET.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Detail_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Detail_GET.java
index 6720e545b..39d2cd663 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Detail_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Detail_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
+import org.fairdatapoint.database.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/schema/Draft_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/schema/Draft_DELETE.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Draft_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Draft_DELETE.java
index fb7c49690..35fea9dfb 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Draft_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Draft_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Draft_GET.java b/src/test/java/org/fairdatapoint/acceptance/schema/Draft_GET.java
similarity index 82%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Draft_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Draft_GET.java
index 01480e34e..f6c28185c 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Draft_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Draft_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestGet;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestGet;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Draft_PUT.java b/src/test/java/org/fairdatapoint/acceptance/schema/Draft_PUT.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Draft_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Draft_PUT.java
index 8c0fab6ec..3f231eaa3 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Draft_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Draft_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.core.Is.is;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Import_POST.java b/src/test/java/org/fairdatapoint/acceptance/schema/Import_POST.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Import_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Import_POST.java
index ebd51901f..a63b37aec 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Import_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Import_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaType;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatapoint.database.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaType;
 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/nl/dtls/fairdatapoint/acceptance/schema/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/schema/List_GET.java
similarity index 93%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/List_GET.java
index 23a821f81..0130df5ad 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
+import org.fairdatapoint.database.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
 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/nl/dtls/fairdatapoint/acceptance/schema/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/schema/List_POST.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/List_POST.java
index dc1c0c10e..6446cbb77 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaChangeDTO;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaDraftDTO;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
@@ -35,8 +35,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
+import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.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/nl/dtls/fairdatapoint/acceptance/schema/Public_GET.java b/src/test/java/org/fairdatapoint/acceptance/schema/Public_GET.java
similarity index 92%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Public_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Public_GET.java
index 7883eac5b..6a9d70408 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Public_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Public_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatapoint.database.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
 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/nl/dtls/fairdatapoint/acceptance/schema/Version_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/schema/Version_DELETE.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Version_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Version_DELETE.java
index 868a5bdb8..4f40c8ea9 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Version_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Version_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
 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.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Version_GET.java b/src/test/java/org/fairdatapoint/acceptance/schema/Version_GET.java
similarity index 86%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Version_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Version_GET.java
index ca839f61f..87f002ec8 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Version_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Version_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
+package org.fairdatapoint.acceptance.schema;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestGet;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestGet;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Version_PUT.java b/src/test/java/org/fairdatapoint/acceptance/schema/Version_PUT.java
similarity index 83%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Version_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Version_PUT.java
index 5acc9ca7e..bd9630f29 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Version_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Version_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaUpdateDTO;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaVersionDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchema;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaState;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaType;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchema;
+import org.fairdatapoint.entity.schema.MetadataSchemaState;
+import org.fairdatapoint.entity.schema.MetadataSchemaType;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.util.KnownUUIDs;
 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.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Versions_POST.java b/src/test/java/org/fairdatapoint/acceptance/schema/Versions_POST.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Versions_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/schema/Versions_POST.java
index 798eb550e..b1b35930b 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/schema/Versions_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/schema/Versions_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.schema;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaDTO;
-import nl.dtls.fairdatapoint.api.dto.schema.MetadataSchemaReleaseDTO;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaRepository;
-import nl.dtls.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
-import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaVersion;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.MetadataSchemaRepository;
+import org.fairdatapoint.database.db.repository.MetadataSchemaVersionRepository;
+import org.fairdatapoint.entity.schema.MetadataSchemaVersion;
+import org.fairdatapoint.util.KnownUUIDs;
 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.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
+import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.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/nl/dtls/fairdatapoint/acceptance/search/Filters_GET.java b/src/test/java/org/fairdatapoint/acceptance/search/Filters_GET.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/Filters_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/search/Filters_GET.java
index 2c04459c2..3feab1b91 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/Filters_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/Filters_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search;
+package org.fairdatapoint.acceptance.search;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.search.SearchFilterDTO;
-import nl.dtls.fairdatapoint.database.db.repository.SettingsRepository;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.search.SearchFilterDTO;
+import org.fairdatapoint.database.db.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/nl/dtls/fairdatapoint/acceptance/search/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/search/List_POST.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/search/List_POST.java
index f6616f3f0..046e25c53 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search;
+package org.fairdatapoint.acceptance.search;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.search.SearchQueryDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchResultDTO;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.search.SearchQueryDTO;
+import org.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/nl/dtls/fairdatapoint/acceptance/search/query/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/search/query/List_GET.java
similarity index 92%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/search/query/List_GET.java
index c9c8a5fc6..bed71f727 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/query/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search.query;
+package org.fairdatapoint.acceptance.search.query;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.search.SearchQueryTemplateDTO;
+import org.fairdatapoint.WebIntegrationTest;
+import org.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/nl/dtls/fairdatapoint/acceptance/search/query/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/search/query/List_POST.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/search/query/List_POST.java
index f987712ac..e3e69f385 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/query/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search.query;
+package org.fairdatapoint.acceptance.search.query;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchResultDTO;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
+import org.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/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
index b67232230..cf49de7c9 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search.query.saved;
+package org.fairdatapoint.acceptance.search.query.saved;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQuery;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
+import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.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/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_GET.java b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
index fef9f2ad0..b2462471e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search.query.saved;
+package org.fairdatapoint.acceptance.search.query.saved;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import nl.dtls.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQuery;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
+import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.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/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
similarity index 93%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
index 18dccae85..148702a1c 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search.query.saved;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import nl.dtls.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQuery;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQueryType;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.SearchSavedQueryRepository;
+import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.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/nl/dtls/fairdatapoint/acceptance/search/query/saved/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_GET.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_GET.java
index d816059ba..90f4ea1b0 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search.query.saved;
+package org.fairdatapoint.acceptance.search.query.saved;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import nl.dtls.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQuery;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
+import org.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
+import org.fairdatapoint.entity.search.SearchSavedQuery;
+import org.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/nl/dtls/fairdatapoint/acceptance/search/query/saved/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_POST.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_POST.java
index e4e48e697..8b66ea332 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/search/query/saved/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/search/query/saved/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.search.query.saved;
+package org.fairdatapoint.acceptance.search.query.saved;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.search.SearchQueryVariablesDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
-import nl.dtls.fairdatapoint.database.db.repository.SearchSavedQueryRepository;
-import nl.dtls.fairdatapoint.entity.search.SearchSavedQueryType;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.SearchSavedQueryRepository;
+import org.fairdatapoint.entity.search.SearchSavedQueryType;
+import org.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/nl/dtls/fairdatapoint/acceptance/settings/List_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/settings/List_DELETE.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/settings/List_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/settings/List_DELETE.java
index 50dea6d2d..c23af6ed2 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/settings/List_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/settings/List_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.settings;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.controller.settings.SettingsDefaults;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsDTO;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsMetricDTO;
-import nl.dtls.fairdatapoint.database.db.repository.SettingsRepository;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.service.settings.SettingsCache;
-import nl.dtls.fairdatapoint.service.settings.SettingsMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+package org.fairdatapoint.acceptance.settings;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.controller.settings.SettingsDefaults;
+import org.fairdatapoint.api.dto.settings.SettingsDTO;
+import org.fairdatapoint.api.dto.settings.SettingsMetricDTO;
+import org.fairdatapoint.database.db.repository.SettingsRepository;
+import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatapoint.service.settings.SettingsMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/settings/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/settings/List_GET.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/settings/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/settings/List_GET.java
index 7398d95b4..d47fd0162 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/settings/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/settings/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.settings;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.controller.settings.SettingsDefaults;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsDTO;
-import nl.dtls.fairdatapoint.api.dto.settings.SettingsMetricDTO;
-import nl.dtls.fairdatapoint.database.db.repository.SettingsRepository;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.service.settings.SettingsCache;
-import nl.dtls.fairdatapoint.service.settings.SettingsMapper;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+package org.fairdatapoint.acceptance.settings;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.controller.settings.SettingsDefaults;
+import org.fairdatapoint.api.dto.settings.SettingsDTO;
+import org.fairdatapoint.api.dto.settings.SettingsMetricDTO;
+import org.fairdatapoint.database.db.repository.SettingsRepository;
+import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatapoint.service.settings.SettingsMapper;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/settings/List_PUT.java b/src/test/java/org/fairdatapoint/acceptance/settings/List_PUT.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/settings/List_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/settings/List_PUT.java
index 7d09ea609..81192ee27 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/settings/List_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/settings/List_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.settings;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.settings.*;
-import nl.dtls.fairdatapoint.database.db.repository.SettingsRepository;
-import nl.dtls.fairdatapoint.entity.settings.Settings;
-import nl.dtls.fairdatapoint.service.settings.SettingsCache;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+package org.fairdatapoint.acceptance.settings;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.settings.*;
+import org.fairdatapoint.database.db.repository.SettingsRepository;
+import org.fairdatapoint.entity.settings.Settings;
+import org.fairdatapoint.service.settings.SettingsCache;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/token/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/token/List_POST.java
similarity index 93%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/token/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/token/List_POST.java
index cf10dd04d..f4af81a08 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/token/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/token/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.token;
+package org.fairdatapoint.acceptance.token;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.auth.AuthDTO;
-import nl.dtls.fairdatapoint.api.dto.auth.TokenDTO;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
+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.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Common.java b/src/test/java/org/fairdatapoint/acceptance/user/Common.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/Common.java
rename to src/test/java/org/fairdatapoint/acceptance/user/Common.java
index d452d7505..98fcbf9ad 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Common.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/Common.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
+package org.fairdatapoint.acceptance.user;
 
-import nl.dtls.fairdatapoint.api.dto.user.UserChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserCreateDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserProfileChangeDTO;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
+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.UserAccount;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Current_GET.java b/src/test/java/org/fairdatapoint/acceptance/user/Current_GET.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/Current_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/user/Current_GET.java
index caf1f3553..60ceb9be7 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Current_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/Current_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
+package org.fairdatapoint.acceptance.user;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/user/Detail_Current_PUT.java b/src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_PUT.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_Current_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_PUT.java
index 6f06dac46..52ad63f24 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_Current_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
+package org.fairdatapoint.acceptance.user;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserProfileChangeDTO;
+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.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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.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/nl/dtls/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java b/src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
index 7c68edbd0..faeab432e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/Detail_Current_Password_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
+package org.fairdatapoint.acceptance.user;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserPasswordDTO;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatapoint.api.dto.user.UserPasswordDTO;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@
 
 import java.net.URI;
 
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
+import static org.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/nl/dtls/fairdatapoint/acceptance/user/Detail_DELETE.java b/src/test/java/org/fairdatapoint/acceptance/user/Detail_DELETE.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_DELETE.java
rename to src/test/java/org/fairdatapoint/acceptance/user/Detail_DELETE.java
index b63c5fbc1..5dc35c1f7 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_DELETE.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/Detail_DELETE.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
+package org.fairdatapoint.acceptance.user;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestDelete;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestDelete;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_GET.java b/src/test/java/org/fairdatapoint/acceptance/user/Detail_GET.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/user/Detail_GET.java
index 926ab0be0..b1eecbd1e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/Detail_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
+package org.fairdatapoint.acceptance.user;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createUserNotFoundTestGet;
+import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/user/Detail_PUT.java b/src/test/java/org/fairdatapoint/acceptance/user/Detail_PUT.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/user/Detail_PUT.java
index 6fa05468a..952944eaa 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/Detail_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.entity.user.UserRole;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.entity.user.UserRole;
+import org.fairdatapoint.util.KnownUUIDs;
 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.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_Password_PUT.java b/src/test/java/org/fairdatapoint/acceptance/user/Detail_Password_PUT.java
similarity index 83%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_Password_PUT.java
rename to src/test/java/org/fairdatapoint/acceptance/user/Detail_Password_PUT.java
index 0807eefdf..ce51dac80 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/Detail_Password_PUT.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/Detail_Password_PUT.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
+package org.fairdatapoint.acceptance.user;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserPasswordDTO;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatapoint.api.dto.user.UserPasswordDTO;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,9 +41,9 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPut;
-import static nl.dtls.fairdatapoint.acceptance.common.NotFoundTest.createAdminNotFoundTestPut;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/List_GET.java b/src/test/java/org/fairdatapoint/acceptance/user/List_GET.java
similarity index 88%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/List_GET.java
rename to src/test/java/org/fairdatapoint/acceptance/user/List_GET.java
index 1c754cf32..6ae232844 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/List_GET.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/List_GET.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
+package org.fairdatapoint.acceptance.user;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.api.dto.user.UserDTO;
+import org.fairdatapoint.database.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@
 import java.net.URI;
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestGet;
+import static org.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/nl/dtls/fairdatapoint/acceptance/user/List_POST.java b/src/test/java/org/fairdatapoint/acceptance/user/List_POST.java
similarity index 87%
rename from src/test/java/nl/dtls/fairdatapoint/acceptance/user/List_POST.java
rename to src/test/java/org/fairdatapoint/acceptance/user/List_POST.java
index ce1dfac4d..8afec312a 100644
--- a/src/test/java/nl/dtls/fairdatapoint/acceptance/user/List_POST.java
+++ b/src/test/java/org/fairdatapoint/acceptance/user/List_POST.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.acceptance.user;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserCreateDTO;
-import nl.dtls.fairdatapoint.api.dto.user.UserDTO;
-import nl.dtls.fairdatapoint.database.db.repository.UserAccountRepository;
-import nl.dtls.fairdatapoint.entity.user.UserAccount;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+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.db.repository.UserAccountRepository;
+import org.fairdatapoint.entity.user.UserAccount;
+import org.fairdatapoint.util.KnownUUIDs;
 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 nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
-import static nl.dtls.fairdatapoint.acceptance.common.ForbiddenTest.createUserForbiddenTestPost;
+import static org.fairdatapoint.acceptance.common.ForbiddenTest.createNoUserForbiddenTestPost;
+import static org.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/nl/dtls/fairdatapoint/config/DatabaseConfig.java b/src/test/java/org/fairdatapoint/config/DatabaseConfig.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/config/DatabaseConfig.java
rename to src/test/java/org/fairdatapoint/config/DatabaseConfig.java
index 6fe4900d5..1a45325d9 100644
--- a/src/test/java/nl/dtls/fairdatapoint/config/DatabaseConfig.java
+++ b/src/test/java/org/fairdatapoint/config/DatabaseConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
 import org.springframework.context.annotation.Bean;
diff --git a/src/test/java/nl/dtls/fairdatapoint/config/MetadataTestConfig.java b/src/test/java/org/fairdatapoint/config/MetadataTestConfig.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/config/MetadataTestConfig.java
rename to src/test/java/org/fairdatapoint/config/MetadataTestConfig.java
index 446e33242..af37d50ad 100644
--- a/src/test/java/nl/dtls/fairdatapoint/config/MetadataTestConfig.java
+++ b/src/test/java/org/fairdatapoint/config/MetadataTestConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.ValueFactory;
diff --git a/src/test/java/nl/dtls/fairdatapoint/config/RepositoryTestConfig.java b/src/test/java/org/fairdatapoint/config/RepositoryTestConfig.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/config/RepositoryTestConfig.java
rename to src/test/java/org/fairdatapoint/config/RepositoryTestConfig.java
index 931432c0f..7c46dbdb7 100644
--- a/src/test/java/nl/dtls/fairdatapoint/config/RepositoryTestConfig.java
+++ b/src/test/java/org/fairdatapoint/config/RepositoryTestConfig.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.config;
+package org.fairdatapoint.config;
 
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryException;
diff --git a/src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java b/src/test/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
rename to src/test/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
index 6dd0c6788..58b02b198 100644
--- a/src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
+++ b/src/test/java/org/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.catalog;
+package org.fairdatapoint.database.rdf.repository.catalog;
 
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
@@ -42,8 +42,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java b/src/test/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
similarity index 88%
rename from src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
rename to src/test/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
index cefe7695f..ad8d2bdbd 100644
--- a/src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
+++ b/src/test/java/org/fairdatapoint/database/rdf/repository/common/MetadataRepositoryTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +25,13 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.common;
+package org.fairdatapoint.database.rdf.repository.common;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -43,9 +43,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getLanguage;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java b/src/test/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
similarity index 86%
rename from src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
rename to src/test/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
index 10e52b761..e984f18f2 100644
--- a/src/test/java/nl/dtls/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
+++ b/src/test/java/org/fairdatapoint/database/rdf/repository/generic/GenericMetadataRepositoryTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.database.rdf.repository.generic;
+package org.fairdatapoint.database.rdf.repository.generic;
 
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
@@ -38,9 +38,9 @@
 
 import java.util.ArrayList;
 
-import static nl.dtls.fairdatapoint.config.CacheConfig.CATALOG_THEMES_CACHE;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getLanguage;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.notNullValue;
diff --git a/src/test/java/nl/dtls/fairdatapoint/entity/schema/SemVerTest.java b/src/test/java/org/fairdatapoint/entity/schema/SemVerTest.java
similarity index 97%
rename from src/test/java/nl/dtls/fairdatapoint/entity/schema/SemVerTest.java
rename to src/test/java/org/fairdatapoint/entity/schema/SemVerTest.java
index 81fd9856d..4c1311651 100644
--- a/src/test/java/nl/dtls/fairdatapoint/entity/schema/SemVerTest.java
+++ b/src/test/java/org/fairdatapoint/entity/schema/SemVerTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.entity.schema;
+package org.fairdatapoint.entity.schema;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/nl/dtls/fairdatapoint/service/index/harvester/HarvesterServiceTest.java b/src/test/java/org/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
similarity index 85%
rename from src/test/java/nl/dtls/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
rename to src/test/java/org/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
index 88e2a7154..8db4d9359 100644
--- a/src/test/java/nl/dtls/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
+++ b/src/test/java/org/fairdatapoint/service/index/harvester/HarvesterServiceTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.index.harvester;
-
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactoryImpl;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import nl.dtls.fairdatapoint.vocabulary.FDP;
+package org.fairdatapoint.service.index.harvester;
+
+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.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatapoint.vocabulary.FDP;
 import org.eclipse.rdf4j.model.Model;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -44,9 +44,9 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static nl.dtls.fairdatapoint.util.RdfIOUtil.write;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
diff --git a/src/test/java/nl/dtls/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java b/src/test/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
similarity index 83%
rename from src/test/java/nl/dtls/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
rename to src/test/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
index ee9f5a271..02c3b3777 100644
--- a/src/test/java/nl/dtls/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
+++ b/src/test/java/org/fairdatapoint/service/metadata/catalog/CatalogMetadataServiceMockTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.catalog;
+package org.fairdatapoint.service.metadata.catalog;
 
-import nl.dtls.fairdatapoint.BaseIntegrationTest;
-import nl.dtls.fairdatapoint.database.rdf.repository.RepositoryMode;
-import nl.dtls.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
-import nl.dtls.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepositoryImpl;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+import org.fairdatapoint.BaseIntegrationTest;
+import org.fairdatapoint.database.rdf.repository.RepositoryMode;
+import org.fairdatapoint.database.rdf.repository.catalog.CatalogMetadataRepository;
+import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepositoryImpl;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -42,9 +42,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getThemeTaxonomies;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/src/test/java/nl/dtls/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java b/src/test/java/org/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
rename to src/test/java/org/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
index 8abd2a065..c8c65111a 100644
--- a/src/test/java/nl/dtls/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
+++ b/src/test/java/org/fairdatapoint/service/metadata/generic/GenericMetadataServiceTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.metadata.generic;
-
-import nl.dtls.fairdatapoint.WebIntegrationTest;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.service.metadata.common.MetadataService;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
-import nl.dtls.fairdatapoint.utils.AuthHelper;
-import nl.dtls.fairdatapoint.utils.TestRdfMetadataFixtures;
+package org.fairdatapoint.service.metadata.generic;
+
+import org.fairdatapoint.WebIntegrationTest;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+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.util.KnownUUIDs;
+import org.fairdatapoint.utils.AuthHelper;
+import org.fairdatapoint.utils.TestRdfMetadataFixtures;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.junit.jupiter.api.BeforeEach;
@@ -41,9 +41,9 @@
 import java.time.OffsetDateTime;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.*;
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataSetter.*;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.entity.metadata.MetadataGetter.*;
+import static org.fairdatapoint.entity.metadata.MetadataSetter.*;
+import static org.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/nl/dtls/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java b/src/test/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
rename to src/test/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
index bfc7ff258..2f7834b27 100644
--- a/src/test/java/nl/dtls/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
+++ b/src/test/java/org/fairdatapoint/service/metadata/metric/MetricsMetadataServiceTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,17 +25,17 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.service.metadata.metric;
+package org.fairdatapoint.service.metadata.metric;
 
-import nl.dtls.fairdatapoint.BaseIntegrationTest;
-import nl.dtls.fairdatapoint.entity.metadata.Metric;
+import org.fairdatapoint.BaseIntegrationTest;
+import org.fairdatapoint.entity.metadata.Metric;
 import org.eclipse.rdf4j.model.IRI;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.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/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java b/src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
similarity index 92%
rename from src/test/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
rename to src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
index 07cd6b4f6..4800c2d54 100644
--- a/src/test/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
+++ b/src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionCacheTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.resource;
+package org.fairdatapoint.service.resource;
 
-import nl.dtls.fairdatapoint.BaseIntegrationTest;
-import nl.dtls.fairdatapoint.Profiles;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.BaseIntegrationTest;
+import org.fairdatapoint.Profiles;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.flywaydb.core.Flyway;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java b/src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
similarity index 94%
rename from src/test/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
rename to src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
index f70262235..845c32f2e 100644
--- a/src/test/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
+++ b/src/test/java/org/fairdatapoint/service/resource/ResourceDefinitionValidatorTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.service.resource;
-
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChildDTO;
-import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChildListViewDTO;
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.entity.exception.ValidationException;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+package org.fairdatapoint.service.resource;
+
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChildDTO;
+import org.fairdatapoint.api.dto.resource.ResourceDefinitionChildListViewDTO;
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+import org.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatapoint.util.KnownUUIDs;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
diff --git a/src/test/java/nl/dtls/fairdatapoint/utils/AuthHelper.java b/src/test/java/org/fairdatapoint/utils/AuthHelper.java
similarity index 91%
rename from src/test/java/nl/dtls/fairdatapoint/utils/AuthHelper.java
rename to src/test/java/org/fairdatapoint/utils/AuthHelper.java
index 4bc3f85dd..564748c26 100644
--- a/src/test/java/nl/dtls/fairdatapoint/utils/AuthHelper.java
+++ b/src/test/java/org/fairdatapoint/utils/AuthHelper.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.utils;
+package org.fairdatapoint.utils;
 
-import nl.dtls.fairdatapoint.service.security.AuthenticationService;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+import org.fairdatapoint.service.security.AuthenticationService;
+import org.fairdatapoint.util.KnownUUIDs;
 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/nl/dtls/fairdatapoint/utils/CustomPageImpl.java b/src/test/java/org/fairdatapoint/utils/CustomPageImpl.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/utils/CustomPageImpl.java
rename to src/test/java/org/fairdatapoint/utils/CustomPageImpl.java
index 9f525e943..5bb5aa629 100644
--- a/src/test/java/nl/dtls/fairdatapoint/utils/CustomPageImpl.java
+++ b/src/test/java/org/fairdatapoint/utils/CustomPageImpl.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.utils;
+package org.fairdatapoint.utils;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
diff --git a/src/test/java/nl/dtls/fairdatapoint/utils/HttpUtilTest.java b/src/test/java/org/fairdatapoint/utils/HttpUtilTest.java
similarity index 96%
rename from src/test/java/nl/dtls/fairdatapoint/utils/HttpUtilTest.java
rename to src/test/java/org/fairdatapoint/utils/HttpUtilTest.java
index e5bb2fc6f..ba06a129a 100644
--- a/src/test/java/nl/dtls/fairdatapoint/utils/HttpUtilTest.java
+++ b/src/test/java/org/fairdatapoint/utils/HttpUtilTest.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.utils;
+package org.fairdatapoint.utils;
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.rdf4j.model.IRI;
@@ -28,7 +28,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static nl.dtls.fairdatapoint.util.HttpUtil.*;
+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/nl/dtls/fairdatapoint/utils/TestIndexEntryFixtures.java b/src/test/java/org/fairdatapoint/utils/TestIndexEntryFixtures.java
similarity index 95%
rename from src/test/java/nl/dtls/fairdatapoint/utils/TestIndexEntryFixtures.java
rename to src/test/java/org/fairdatapoint/utils/TestIndexEntryFixtures.java
index 86d9ffa1f..76fadfb8d 100644
--- a/src/test/java/nl/dtls/fairdatapoint/utils/TestIndexEntryFixtures.java
+++ b/src/test/java/org/fairdatapoint/utils/TestIndexEntryFixtures.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.utils;
+package org.fairdatapoint.utils;
 
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntry;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryState;
+import org.fairdatapoint.entity.index.entry.IndexEntry;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.fairdatapoint.entity.index.entry.IndexEntryState;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/src/test/java/nl/dtls/fairdatapoint/utils/TestRdfMetadataFixtures.java b/src/test/java/org/fairdatapoint/utils/TestRdfMetadataFixtures.java
similarity index 90%
rename from src/test/java/nl/dtls/fairdatapoint/utils/TestRdfMetadataFixtures.java
rename to src/test/java/org/fairdatapoint/utils/TestRdfMetadataFixtures.java
index c666e7789..c26c7d585 100644
--- a/src/test/java/nl/dtls/fairdatapoint/utils/TestRdfMetadataFixtures.java
+++ b/src/test/java/org/fairdatapoint/utils/TestRdfMetadataFixtures.java
@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2016-2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,20 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.utils;
-
-import nl.dtls.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.data.RdfMetadataFixtures;
-import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.factory.MetadataFactory;
-import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition;
-import nl.dtls.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
-import nl.dtls.fairdatapoint.util.KnownUUIDs;
+package org.fairdatapoint.utils;
+
+import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
+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.fairdatapoint.util.KnownUUIDs;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getUri;
+import static org.fairdatapoint.entity.metadata.MetadataGetter.getUri;
 
 @Component
 public class TestRdfMetadataFixtures extends RdfMetadataFixtures {
diff --git a/src/test/resources/log4j2.local.xml b/src/test/resources/log4j2.local.xml
index 3646314be..9eec501f4 100644
--- a/src/test/resources/log4j2.local.xml
+++ b/src/test/resources/log4j2.local.xml
@@ -9,7 +9,7 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name=" nl.dtls.fairdatapoint.api.controller.exception" level="DEBUG"/>
+        <Logger name=" org.fairdatapoint.api.controller.exception" level="DEBUG"/>
         <Root level="INFO">
             <AppenderRef ref="Console"/>
         </Root>
diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml
index e69d0e3be..77fa02165 100644
--- a/src/test/resources/log4j2.xml
+++ b/src/test/resources/log4j2.xml
@@ -6,7 +6,7 @@
         </Console>
     </Appenders>
     <Loggers>
-        <!-- <Logger name="nl.dtls.fairdatapoint.api.controller.exception" level="DEBUG"/> -->
+        <!-- <Logger name="org.fairdatapoint.api.controller.exception" level="DEBUG"/> -->
         <Logger name="org.springframework" level="off"/>
         <Root level="off"/>
     </Loggers>
diff --git a/src/test/resources/test/db/migration/V0001.1__dev-data-users.sql b/src/test/resources/test/db/migration/V0001.1__dev-data-users.sql
index 77dce5687..cd8e0a967 100644
--- a/src/test/resources/test/db/migration/V0001.1__dev-data-users.sql
+++ b/src/test/resources/test/db/migration/V0001.1__dev-data-users.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/resources/test/db/migration/V0001.2__dev-data-schemas.sql b/src/test/resources/test/db/migration/V0001.2__dev-data-schemas.sql
index 78c141f8c..310c8377f 100644
--- a/src/test/resources/test/db/migration/V0001.2__dev-data-schemas.sql
+++ b/src/test/resources/test/db/migration/V0001.2__dev-data-schemas.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/resources/test/db/migration/V0001.3__dev-data-rds.sql b/src/test/resources/test/db/migration/V0001.3__dev-data-rds.sql
index 29eb20aeb..ed4f047ff 100644
--- a/src/test/resources/test/db/migration/V0001.3__dev-data-rds.sql
+++ b/src/test/resources/test/db/migration/V0001.3__dev-data-rds.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/resources/test/db/migration/V0001.4__dev-data-membership.sql b/src/test/resources/test/db/migration/V0001.4__dev-data-membership.sql
index 9e699a971..8240e0bfe 100644
--- a/src/test/resources/test/db/migration/V0001.4__dev-data-membership.sql
+++ b/src/test/resources/test/db/migration/V0001.4__dev-data-membership.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/resources/test/db/migration/V0001.5__dev-settings.sql b/src/test/resources/test/db/migration/V0001.5__dev-settings.sql
index f6df63825..75496e02a 100644
--- a/src/test/resources/test/db/migration/V0001.5__dev-settings.sql
+++ b/src/test/resources/test/db/migration/V0001.5__dev-settings.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/resources/test/db/migration/V0001.6__test-schemas.sql b/src/test/resources/test/db/migration/V0001.6__test-schemas.sql
index ba9e075c5..b340329e8 100644
--- a/src/test/resources/test/db/migration/V0001.6__test-schemas.sql
+++ b/src/test/resources/test/db/migration/V0001.6__test-schemas.sql
@@ -1,6 +1,6 @@
 --
 -- The MIT License
--- Copyright © 2017 DTL
+-- Copyright © 2016-2024 FAIR Data Team
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and associated documentation files (the "Software"), to deal