diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
index 645e5228ec..07f64f3e8e 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
@@ -23,19 +23,19 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidConfiguration;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.orcid.service.OrcidTokenService;
-import org.dspace.app.profile.ResearcherProfile;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.dspace.services.ConfigurationService;
 import org.orcid.jaxb.model.v3.release.record.Email;
 import org.orcid.jaxb.model.v3.release.record.Person;
diff --git a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
index 0154497c4e..27d0ba189c 100644
--- a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
@@ -27,15 +27,6 @@ import java.util.stream.Stream;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.orcid.service.OrcidTokenService;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.util.AuthorizeUtil;
 import org.dspace.authorize.AuthorizeConfiguration;
 import org.dspace.authorize.AuthorizeException;
@@ -67,6 +58,15 @@ import org.dspace.harvest.HarvestedItem;
 import org.dspace.harvest.service.HarvestedItemService;
 import org.dspace.identifier.IdentifierException;
 import org.dspace.identifier.service.IdentifierService;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.versioning.service.VersioningService;
 import org.dspace.workflow.WorkflowItemService;
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
index 51ebb90da2..61477995c7 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
@@ -25,7 +25,6 @@ import org.apache.commons.codec.DecoderException;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
-import org.dspace.app.orcid.service.OrcidTokenService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
@@ -47,6 +46,7 @@ import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.eperson.service.SubscribeService;
 import org.dspace.event.Event;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.util.UUIDUtils;
 import org.dspace.versioning.Version;
 import org.dspace.versioning.VersionHistory;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/OrcidHistory.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
similarity index 99%
rename from dspace-api/src/main/java/org/dspace/app/orcid/OrcidHistory.java
rename to dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
index f4aae81ce1..33edea112e 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/OrcidHistory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid;
+package org.dspace.orcid;
 
 import java.util.Date;
 import javax.persistence.Column;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/OrcidOperation.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidOperation.java
similarity index 93%
rename from dspace-api/src/main/java/org/dspace/app/orcid/OrcidOperation.java
rename to dspace-api/src/main/java/org/dspace/orcid/OrcidOperation.java
index e5e2c7b35e..381e35e84d 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/OrcidOperation.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidOperation.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid;
+package org.dspace.orcid;
 
 /**
  * Enum that models an ORCID synchronization operation.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/OrcidQueue.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
similarity index 99%
rename from dspace-api/src/main/java/org/dspace/app/orcid/OrcidQueue.java
rename to dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
index ca6fd715c1..4794e89008 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/OrcidQueue.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid;
+package org.dspace.orcid;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/OrcidToken.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/orcid/OrcidToken.java
rename to dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
index f84f4d6909..def289daf4 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/OrcidToken.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid;
+package org.dspace.orcid;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidClient.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClient.java
similarity index 95%
rename from dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidClient.java
rename to dspace-api/src/main/java/org/dspace/orcid/client/OrcidClient.java
index 7a680b39ca..e8b0f74186 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidClient.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClient.java
@@ -5,10 +5,10 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.client;
+package org.dspace.orcid.client;
 
-import org.dspace.app.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
 import org.orcid.jaxb.model.v3.release.record.Person;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidClientImpl.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidClientImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
index 798a30c354..45387708a9 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidClientImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.client;
+package org.dspace.orcid.client;
 
 import static org.apache.http.client.methods.RequestBuilder.delete;
 import static org.apache.http.client.methods.RequestBuilder.get;
@@ -41,10 +41,10 @@ import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicNameValuePair;
-import org.dspace.app.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
 import org.dspace.util.ThrowingSupplier;
 import org.orcid.jaxb.model.v3.release.record.Address;
 import org.orcid.jaxb.model.v3.release.record.Funding;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidConfiguration.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidConfiguration.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidConfiguration.java
rename to dspace-api/src/main/java/org/dspace/orcid/client/OrcidConfiguration.java
index 0697fda3d8..f45680e148 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidConfiguration.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.client;
+package org.dspace.orcid.client;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidResponse.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidResponse.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidResponse.java
rename to dspace-api/src/main/java/org/dspace/orcid/client/OrcidResponse.java
index fb2643bf23..ef0050cf20 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidResponse.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidResponse.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.client;
+package org.dspace.orcid.client;
 
 import org.apache.http.HttpStatus;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/consumer/OrcidQueueConsumer.java b/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
similarity index 95%
rename from dspace-api/src/main/java/org/dspace/app/orcid/consumer/OrcidQueueConsumer.java
rename to dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
index 347d16d611..d177e61607 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/consumer/OrcidQueueConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.consumer;
+package org.dspace.orcid.consumer;
 
 import static java.util.Arrays.asList;
 import static java.util.Comparator.comparing;
@@ -22,17 +22,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidOperation;
-import org.dspace.app.orcid.factory.OrcidServiceFactory;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.orcid.service.OrcidTokenService;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
@@ -43,6 +32,17 @@ import org.dspace.content.service.RelationshipService;
 import org.dspace.core.Context;
 import org.dspace.event.Consumer;
 import org.dspace.event.Event;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.OrcidProfileSyncPreference;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.slf4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidHistoryDAO.java b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidHistoryDAO.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidHistoryDAO.java
rename to dspace-api/src/main/java/org/dspace/orcid/dao/OrcidHistoryDAO.java
index ec56190c4b..9e82f3c51d 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidHistoryDAO.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidHistoryDAO.java
@@ -5,16 +5,16 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.dao;
+package org.dspace.orcid.dao;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 
-import org.dspace.app.orcid.OrcidHistory;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.core.GenericDAO;
+import org.dspace.orcid.OrcidHistory;
 
 /**
  * Database Access Object interface class for the OrcidHistory object. The
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidQueueDAO.java b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidQueueDAO.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidQueueDAO.java
rename to dspace-api/src/main/java/org/dspace/orcid/dao/OrcidQueueDAO.java
index 6d0d9c2934..235443b150 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidQueueDAO.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidQueueDAO.java
@@ -5,16 +5,16 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.dao;
+package org.dspace.orcid.dao;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 
-import org.dspace.app.orcid.OrcidQueue;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.core.GenericDAO;
+import org.dspace.orcid.OrcidQueue;
 
 /**
  * Database Access Object interface class for the OrcidQueue object. The
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidTokenDAO.java b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidTokenDAO.java
similarity index 94%
rename from dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidTokenDAO.java
rename to dspace-api/src/main/java/org/dspace/orcid/dao/OrcidTokenDAO.java
index 4938fe2ffe..00ec3dd274 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidTokenDAO.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidTokenDAO.java
@@ -5,13 +5,13 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.dao;
+package org.dspace.orcid.dao;
 
-import org.dspace.app.orcid.OrcidToken;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.core.GenericDAO;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
 
 /**
  * Database Access Object interface class for the OrcidToken object. The
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidHistoryDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
similarity index 94%
rename from dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidHistoryDAOImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
index 42ed2a4afd..0b2c7099ff 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidHistoryDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
@@ -5,18 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.dao.impl;
+package org.dspace.orcid.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 import javax.persistence.Query;
 
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.dao.OrcidHistoryDAO;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.dao.OrcidHistoryDAO;
 
 /**
  * Implementation of {@link OrcidHistoryDAO}.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidQueueDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
similarity index 96%
rename from dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidQueueDAOImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
index 87b071de78..2114b25357 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidQueueDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
@@ -5,18 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.dao.impl;
+package org.dspace.orcid.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 import javax.persistence.Query;
 
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.dao.OrcidQueueDAO;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.dao.OrcidQueueDAO;
 
 /**
  * Implementation of {@link OrcidQueueDAO}.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidTokenDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
similarity index 91%
rename from dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidTokenDAOImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
index 3dbeb95c94..01b03fc354 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidTokenDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
@@ -5,17 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.dao.impl;
+package org.dspace.orcid.dao.impl;
 
 import java.sql.SQLException;
 import javax.persistence.Query;
 
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.dao.OrcidTokenDAO;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.dao.OrcidTokenDAO;
 
 /**
  * Implementation of {@link OrcidTokenDAO}.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/exception/OrcidClientException.java b/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidClientException.java
similarity index 96%
rename from dspace-api/src/main/java/org/dspace/app/orcid/exception/OrcidClientException.java
rename to dspace-api/src/main/java/org/dspace/orcid/exception/OrcidClientException.java
index 6dc93c1882..9e78ef07b0 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/exception/OrcidClientException.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidClientException.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.exception;
+package org.dspace.orcid.exception;
 
 /**
  * Exception throwable from class that implements {@link OrcidClient} in case of
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/exception/OrcidValidationException.java b/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidValidationException.java
similarity index 92%
rename from dspace-api/src/main/java/org/dspace/app/orcid/exception/OrcidValidationException.java
rename to dspace-api/src/main/java/org/dspace/orcid/exception/OrcidValidationException.java
index 62b9b9a9c3..bb35789ab9 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/exception/OrcidValidationException.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidValidationException.java
@@ -5,12 +5,12 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.exception;
+package org.dspace.orcid.exception;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.dspace.app.orcid.model.validator.OrcidValidationError;
+import org.dspace.orcid.model.validator.OrcidValidationError;
 
 /**
  * A Runtime exception that occurs when an ORCID object that must be send to
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/factory/OrcidServiceFactory.java b/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactory.java
similarity index 71%
rename from dspace-api/src/main/java/org/dspace/app/orcid/factory/OrcidServiceFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactory.java
index 0b46c30b19..09f43229d6 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/factory/OrcidServiceFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactory.java
@@ -5,17 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.factory;
+package org.dspace.orcid.factory;
 
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidConfiguration;
-import org.dspace.app.orcid.service.MetadataSignatureGenerator;
-import org.dspace.app.orcid.service.OrcidEntityFactoryService;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.orcid.service.OrcidTokenService;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/factory/OrcidServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactoryImpl.java
similarity index 80%
rename from dspace-api/src/main/java/org/dspace/app/orcid/factory/OrcidServiceFactoryImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactoryImpl.java
index 143ecb5b9d..78972eba85 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/factory/OrcidServiceFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactoryImpl.java
@@ -5,17 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.factory;
+package org.dspace.orcid.factory;
 
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidConfiguration;
-import org.dspace.app.orcid.service.MetadataSignatureGenerator;
-import org.dspace.app.orcid.service.OrcidEntityFactoryService;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.orcid.service.OrcidTokenService;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidEntityType.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidEntityType.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidEntityType.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/OrcidEntityType.java
index d4e8235265..6b32818f76 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidEntityType.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidEntityType.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model;
+package org.dspace.orcid.model;
 
 import java.util.Arrays;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidFundingFieldMapping.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidFundingFieldMapping.java
similarity index 96%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidFundingFieldMapping.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/OrcidFundingFieldMapping.java
index 1d386bc983..1a8333058a 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidFundingFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidFundingFieldMapping.java
@@ -5,18 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model;
+package org.dspace.orcid.model;
 
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toMap;
-import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.dspace.app.orcid.model.factory.OrcidFactoryUtils;
+import org.dspace.orcid.model.factory.OrcidFactoryUtils;
 import org.dspace.util.SimpleMapConverter;
 import org.orcid.jaxb.model.common.FundingContributorRole;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidProfileSectionType.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidProfileSectionType.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidProfileSectionType.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/OrcidProfileSectionType.java
index 8e0361572e..7521844d2d 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidProfileSectionType.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidProfileSectionType.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model;
+package org.dspace.orcid.model;
 
 import org.apache.commons.lang3.EnumUtils;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidTokenResponseDTO.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidTokenResponseDTO.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidTokenResponseDTO.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/OrcidTokenResponseDTO.java
index cac75a7908..6b3594f9b8 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidTokenResponseDTO.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidTokenResponseDTO.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model;
+package org.dspace.orcid.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidWorkFieldMapping.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidWorkFieldMapping.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidWorkFieldMapping.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/OrcidWorkFieldMapping.java
index 259f396614..781a9dcbd9 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidWorkFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidWorkFieldMapping.java
@@ -5,11 +5,11 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model;
+package org.dspace.orcid.model;
 
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toMap;
-import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidCommonObjectFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
similarity index 96%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidCommonObjectFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
index 7a719821d4..4ca36c2169 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidCommonObjectFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
@@ -5,14 +5,14 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory;
+package org.dspace.orcid.model.factory;
 
 import java.util.Optional;
 
-import org.dspace.app.orcid.exception.OrcidValidationException;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
+import org.dspace.orcid.exception.OrcidValidationException;
 import org.orcid.jaxb.model.common.ContributorRole;
 import org.orcid.jaxb.model.common.FundingContributorRole;
 import org.orcid.jaxb.model.v3.release.common.Contributor;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidEntityFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidEntityFactory.java
similarity index 91%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidEntityFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidEntityFactory.java
index 7c1a6a6a40..3fbad15911 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidEntityFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidEntityFactory.java
@@ -5,11 +5,11 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory;
+package org.dspace.orcid.model.factory;
 
-import org.dspace.app.orcid.model.OrcidEntityType;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
 import org.orcid.jaxb.model.v3.release.record.Activity;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidFactoryUtils.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidFactoryUtils.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidFactoryUtils.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidFactoryUtils.java
index 0a8211a981..4b8c1178ef 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidFactoryUtils.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidFactoryUtils.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory;
+package org.dspace.orcid.model.factory;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidProfileSectionFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidProfileSectionFactory.java
similarity index 93%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidProfileSectionFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidProfileSectionFactory.java
index 87dd2a6236..731b6f84a3 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidProfileSectionFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidProfileSectionFactory.java
@@ -5,15 +5,15 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory;
+package org.dspace.orcid.model.factory;
 
 import java.util.List;
 
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.profile.OrcidProfileSyncPreference;
 
 /**
  * Interface for classes that creates ORCID profile section object.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java
similarity index 87%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java
index 007c1a90aa..4ce4cca8c2 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java
@@ -5,20 +5,20 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory.impl;
+package org.dspace.orcid.model.factory.impl;
 
 import static java.lang.String.format;
 
 import java.util.List;
 
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.orcid.model.factory.OrcidCommonObjectFactory;
-import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
-import org.dspace.app.orcid.service.MetadataSignatureGenerator;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+import org.dspace.profile.OrcidProfileSyncPreference;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
similarity index 96%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
index a2bfb80d7c..2f47aa53d6 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory.impl;
+package org.dspace.orcid.model.factory.impl;
 
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
@@ -13,7 +13,7 @@ import static java.util.Optional.ofNullable;
 import static org.apache.commons.lang3.EnumUtils.isValidEnum;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
 import static org.orcid.jaxb.model.common.SequenceType.ADDITIONAL;
 import static org.orcid.jaxb.model.common.SequenceType.FIRST;
 
@@ -25,16 +25,16 @@ import java.util.Map;
 import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.app.orcid.client.OrcidConfiguration;
-import org.dspace.app.orcid.exception.OrcidValidationException;
-import org.dspace.app.orcid.model.factory.OrcidCommonObjectFactory;
-import org.dspace.app.orcid.model.validator.OrcidValidationError;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.handle.service.HandleService;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.exception.OrcidValidationException;
+import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
+import org.dspace.orcid.model.validator.OrcidValidationError;
 import org.dspace.util.MultiFormatDateParser;
 import org.dspace.util.SimpleMapConverter;
 import org.orcid.jaxb.model.common.ContributorRole;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidFundingFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidFundingFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
index f7fa3b8e90..e8cf5ea9a6 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidFundingFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory.impl;
+package org.dspace.orcid.model.factory.impl;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -18,10 +18,6 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.OrcidFundingFieldMapping;
-import org.dspace.app.orcid.model.factory.OrcidCommonObjectFactory;
-import org.dspace.app.orcid.model.factory.OrcidEntityFactory;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.Relationship;
@@ -30,6 +26,10 @@ import org.dspace.content.service.ItemService;
 import org.dspace.content.service.RelationshipService;
 import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidFundingFieldMapping;
+import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
+import org.dspace.orcid.model.factory.OrcidEntityFactory;
 import org.orcid.jaxb.model.common.FundingContributorRole;
 import org.orcid.jaxb.model.common.FundingType;
 import org.orcid.jaxb.model.v3.release.common.Amount;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java
similarity index 87%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java
index d0aa5ab6b7..077bb195a6 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java
@@ -5,20 +5,20 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory.impl;
+package org.dspace.orcid.model.factory.impl;
 
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
-import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+import static org.dspace.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
+import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
 import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.profile.OrcidProfileSyncPreference;
 import org.orcid.jaxb.model.common.Relationship;
 import org.orcid.jaxb.model.v3.release.common.Url;
 import org.orcid.jaxb.model.v3.release.record.PersonExternalIdentifier;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java
similarity index 91%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java
index a5a59e6ad0..4ddfbe47a3 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java
@@ -5,25 +5,25 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory.impl;
+package org.dspace.orcid.model.factory.impl;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.COUNTRY;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.KEYWORDS;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.COUNTRY;
+import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
+import static org.dspace.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.profile.OrcidProfileSyncPreference;
 import org.orcid.jaxb.model.v3.release.common.Country;
 import org.orcid.jaxb.model.v3.release.common.Url;
 import org.orcid.jaxb.model.v3.release.record.Address;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidWorkFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidWorkFactory.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
index 35a9937645..d29e22f96a 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidWorkFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.factory.impl;
+package org.dspace.orcid.model.factory.impl;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -19,14 +19,14 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.EnumUtils;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.OrcidWorkFieldMapping;
-import org.dspace.app.orcid.model.factory.OrcidCommonObjectFactory;
-import org.dspace.app.orcid.model.factory.OrcidEntityFactory;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidWorkFieldMapping;
+import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
+import org.dspace.orcid.model.factory.OrcidEntityFactory;
 import org.orcid.jaxb.model.common.ContributorRole;
 import org.orcid.jaxb.model.common.LanguageCode;
 import org.orcid.jaxb.model.common.Relationship;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/validator/OrcidValidationError.java b/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidationError.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/validator/OrcidValidationError.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidationError.java
index 2d705495e4..36f92cf1c5 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/validator/OrcidValidationError.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidationError.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.validator;
+package org.dspace.orcid.model.validator;
 
 /**
  * Enum that model all the errors that could occurs during an ORCID object
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/validator/OrcidValidator.java b/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidator.java
similarity index 96%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/validator/OrcidValidator.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidator.java
index d27737727f..7b30717e2d 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/validator/OrcidValidator.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidator.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.validator;
+package org.dspace.orcid.model.validator;
 
 import java.util.List;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/model/validator/impl/OrcidValidatorImpl.java b/dspace-api/src/main/java/org/dspace/orcid/model/validator/impl/OrcidValidatorImpl.java
similarity index 82%
rename from dspace-api/src/main/java/org/dspace/app/orcid/model/validator/impl/OrcidValidatorImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/model/validator/impl/OrcidValidatorImpl.java
index dc823892a8..a599695c07 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/model/validator/impl/OrcidValidatorImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/validator/impl/OrcidValidatorImpl.java
@@ -5,32 +5,32 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.validator.impl;
+package org.dspace.orcid.model.validator.impl;
 
 import static org.apache.commons.collections.CollectionUtils.isEmpty;
 import static org.apache.commons.lang3.ArrayUtils.contains;
 import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.dspace.app.orcid.model.validator.OrcidValidationError;
-import org.dspace.app.orcid.model.validator.OrcidValidator;
+import org.dspace.orcid.model.validator.OrcidValidationError;
+import org.dspace.orcid.model.validator.OrcidValidator;
 import org.dspace.services.ConfigurationService;
 import org.orcid.jaxb.model.v3.release.common.DisambiguatedOrganization;
 import org.orcid.jaxb.model.v3.release.common.Organization;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/script/OrcidBulkPush.java b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
similarity index 94%
rename from dspace-api/src/main/java/org/dspace/app/orcid/script/OrcidBulkPush.java
rename to dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
index 3a8b659ee5..569c4a96e3 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/script/OrcidBulkPush.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
@@ -5,11 +5,11 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.script;
+package org.dspace.orcid.script;
 
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
-import static org.dspace.app.profile.OrcidSynchronizationMode.BATCH;
-import static org.dspace.app.profile.OrcidSynchronizationMode.MANUAL;
+import static org.dspace.profile.OrcidSynchronizationMode.BATCH;
+import static org.dspace.profile.OrcidSynchronizationMode.MANUAL;
 
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -20,18 +20,18 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.exception.OrcidValidationException;
-import org.dspace.app.orcid.factory.OrcidServiceFactory;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.profile.OrcidSynchronizationMode;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.exception.OrcidValidationException;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.OrcidSynchronizationMode;
 import org.dspace.scripts.DSpaceRunnable;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/script/OrcidBulkPushScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPushScriptConfiguration.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/orcid/script/OrcidBulkPushScriptConfiguration.java
rename to dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPushScriptConfiguration.java
index 62eafb6fa3..1a657343c0 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/script/OrcidBulkPushScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPushScriptConfiguration.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.script;
+package org.dspace.orcid.script;
 
 import java.sql.SQLException;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/MetadataSignatureGenerator.java b/dspace-api/src/main/java/org/dspace/orcid/service/MetadataSignatureGenerator.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/MetadataSignatureGenerator.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/MetadataSignatureGenerator.java
index 02a7fc78ac..28a270faa7 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/MetadataSignatureGenerator.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/MetadataSignatureGenerator.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import java.util.List;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidEntityFactoryService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidEntityFactoryService.java
similarity index 96%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidEntityFactoryService.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/OrcidEntityFactoryService.java
index 6aff3acd6d..78f2c1331d 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidEntityFactoryService.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidEntityFactoryService.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import org.dspace.content.Item;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidHistoryService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidHistoryService.java
similarity index 96%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidHistoryService.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/OrcidHistoryService.java
index 19a423d87b..13e1a52b6f 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidHistoryService.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidHistoryService.java
@@ -5,18 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.exception.OrcidValidationException;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.exception.OrcidValidationException;
 
 /**
  * Interface of service to manage OrcidHistory.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidProfileSectionFactoryService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidProfileSectionFactoryService.java
similarity index 88%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidProfileSectionFactoryService.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/OrcidProfileSectionFactoryService.java
index 47e6a52f09..603d33ddf5 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidProfileSectionFactoryService.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidProfileSectionFactoryService.java
@@ -5,16 +5,16 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import java.util.List;
 import java.util.Optional;
 
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
 import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.dspace.profile.OrcidProfileSyncPreference;
 
 /**
  * Interface that mark classes that handle the configured instance of
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidQueueService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidQueueService.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidQueueService.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/OrcidQueueService.java
index efc39598cf..8de25e9caf 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidQueueService.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidQueueService.java
@@ -5,18 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.profile.OrcidEntitySyncPreference;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.profile.OrcidEntitySyncPreference;
 
 /**
  * Service that handles ORCID queue records.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidSynchronizationService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
similarity index 94%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidSynchronizationService.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
index 709d0bd3be..66c0bf11b2 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidSynchronizationService.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
@@ -5,20 +5,20 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Optional;
 
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
-import org.dspace.app.profile.OrcidEntitySyncPreference;
-import org.dspace.app.profile.OrcidProfileDisconnectionMode;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
-import org.dspace.app.profile.OrcidSynchronizationMode;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileDisconnectionMode;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
 
 /**
  * Service that handle the the syncronization between a DSpace profile and the
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidTokenService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidTokenService.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidTokenService.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/OrcidTokenService.java
index aab9c78661..ead9682971 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidTokenService.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidTokenService.java
@@ -5,12 +5,12 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
-import org.dspace.app.orcid.OrcidToken;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
 
 /**
  * Service that handle {@link OrcidToken} entities.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidEntityFactoryServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
similarity index 90%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
index 9902cd8681..c02185b430 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service.impl;
+package org.dspace.orcid.service.impl;
 
 import static java.util.stream.Collectors.toMap;
 
@@ -14,12 +14,12 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.factory.OrcidEntityFactory;
-import org.dspace.app.orcid.service.OrcidEntityFactoryService;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.factory.OrcidEntityFactory;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
 import org.orcid.jaxb.model.v3.release.record.Activity;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidHistoryServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
similarity index 93%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidHistoryServiceImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
index a43f9c626d..836f6fdbed 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidHistoryServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service.impl;
+package org.dspace.orcid.service.impl;
 
 import static java.lang.String.format;
 import static java.util.Comparator.comparing;
@@ -24,29 +24,29 @@ import java.util.Optional;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidOperation;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidResponse;
-import org.dspace.app.orcid.dao.OrcidHistoryDAO;
-import org.dspace.app.orcid.dao.OrcidQueueDAO;
-import org.dspace.app.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.exception.OrcidValidationException;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.orcid.model.validator.OrcidValidationError;
-import org.dspace.app.orcid.model.validator.OrcidValidator;
-import org.dspace.app.orcid.service.MetadataSignatureGenerator;
-import org.dspace.app.orcid.service.OrcidEntityFactoryService;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
-import org.dspace.app.orcid.service.OrcidTokenService;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidResponse;
+import org.dspace.orcid.dao.OrcidHistoryDAO;
+import org.dspace.orcid.dao.OrcidQueueDAO;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.exception.OrcidValidationException;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.validator.OrcidValidationError;
+import org.dspace.orcid.model.validator.OrcidValidator;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.orcid.jaxb.model.v3.release.record.Activity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java
similarity index 87%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java
index 3e09b00cd2..fad5a6657d 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service.impl;
+package org.dspace.orcid.service.impl;
 
 import static java.util.stream.Collectors.toMap;
 
@@ -16,12 +16,12 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
-import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
 import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.profile.OrcidProfileSyncPreference;
 
 /**
  * Implementation of {@link OrcidProfileSectionFactoryService}.
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidQueueServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidQueueServiceImpl.java
similarity index 95%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidQueueServiceImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidQueueServiceImpl.java
index 8b918e6205..d3300fea66 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidQueueServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidQueueServiceImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service.impl;
+package org.dspace.orcid.service.impl;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -13,19 +13,19 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import org.dspace.app.orcid.OrcidOperation;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.dao.OrcidQueueDAO;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.profile.OrcidEntitySyncPreference;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
 import org.dspace.content.Relationship;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.RelationshipService;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.dao.OrcidQueueDAO;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.profile.OrcidEntitySyncPreference;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidSynchronizationServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
similarity index 94%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidSynchronizationServiceImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
index c4478e2c95..7ce423d742 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidSynchronizationServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service.impl;
+package org.dspace.orcid.service.impl;
 
 import static java.time.LocalDateTime.now;
 import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
@@ -14,8 +14,8 @@ import static java.util.Optional.ofNullable;
 import static org.apache.commons.collections.CollectionUtils.isEmpty;
 import static org.apache.commons.lang3.EnumUtils.isValidEnum;
 import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.dspace.app.profile.OrcidEntitySyncPreference.DISABLED;
 import static org.dspace.content.Item.ANY;
+import static org.dspace.profile.OrcidEntitySyncPreference.DISABLED;
 
 import java.sql.SQLException;
 import java.util.HashSet;
@@ -25,16 +25,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.codec.binary.StringUtils;
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.orcid.service.OrcidTokenService;
-import org.dspace.app.profile.OrcidEntitySyncPreference;
-import org.dspace.app.profile.OrcidProfileDisconnectionMode;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
-import org.dspace.app.profile.OrcidSynchronizationMode;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
@@ -42,6 +32,16 @@ import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileDisconnectionMode;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidTokenServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidTokenServiceImpl.java
similarity index 93%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidTokenServiceImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidTokenServiceImpl.java
index 2b9b6af4f3..bf10ea981c 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidTokenServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidTokenServiceImpl.java
@@ -5,17 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service.impl;
+package org.dspace.orcid.service.impl;
 
 import java.sql.SQLException;
 import java.util.List;
 
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.dao.OrcidTokenDAO;
-import org.dspace.app.orcid.service.OrcidTokenService;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.dao.OrcidTokenDAO;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java
rename to dspace-api/src/main/java/org/dspace/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java
index e71d3928ad..4888462ce4 100644
--- a/dspace-api/src/main/java/org/dspace/app/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service.impl;
+package org.dspace.orcid.service.impl;
 
 import static java.util.Comparator.comparing;
 
@@ -16,10 +16,10 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.app.orcid.service.MetadataSignatureGenerator;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
 
 /**
  * Implementation of {@link MetadataSignatureGenerator} that composes a
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/OrcidEntitySyncPreference.java b/dspace-api/src/main/java/org/dspace/profile/OrcidEntitySyncPreference.java
similarity index 95%
rename from dspace-api/src/main/java/org/dspace/app/profile/OrcidEntitySyncPreference.java
rename to dspace-api/src/main/java/org/dspace/profile/OrcidEntitySyncPreference.java
index 9ee2f0d9a9..74efc57e38 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/OrcidEntitySyncPreference.java
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidEntitySyncPreference.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile;
+package org.dspace.profile;
 
 /**
  * Enum that model the allowed values to configure the ORCID synchronization
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/OrcidMetadataCopyingAction.java b/dspace-api/src/main/java/org/dspace/profile/OrcidMetadataCopyingAction.java
similarity index 94%
rename from dspace-api/src/main/java/org/dspace/app/profile/OrcidMetadataCopyingAction.java
rename to dspace-api/src/main/java/org/dspace/profile/OrcidMetadataCopyingAction.java
index bafc9b2e9a..36abea9ddb 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/OrcidMetadataCopyingAction.java
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidMetadataCopyingAction.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile;
+package org.dspace.profile;
 
 import static java.time.LocalDateTime.now;
 import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
@@ -17,9 +17,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.service.OrcidTokenService;
-import org.dspace.app.profile.service.AfterResearcherProfileCreationAction;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
 import org.dspace.content.MetadataValue;
@@ -27,6 +24,9 @@ import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.service.AfterResearcherProfileCreationAction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/OrcidProfileDisconnectionMode.java b/dspace-api/src/main/java/org/dspace/profile/OrcidProfileDisconnectionMode.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/profile/OrcidProfileDisconnectionMode.java
rename to dspace-api/src/main/java/org/dspace/profile/OrcidProfileDisconnectionMode.java
index e53ba13f5a..22b13f047c 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/OrcidProfileDisconnectionMode.java
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidProfileDisconnectionMode.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile;
+package org.dspace.profile;
 
 import static org.apache.commons.lang3.EnumUtils.isValidEnum;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/OrcidProfileSyncPreference.java b/dspace-api/src/main/java/org/dspace/profile/OrcidProfileSyncPreference.java
similarity index 95%
rename from dspace-api/src/main/java/org/dspace/app/profile/OrcidProfileSyncPreference.java
rename to dspace-api/src/main/java/org/dspace/profile/OrcidProfileSyncPreference.java
index 86dd598545..a867694490 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/OrcidProfileSyncPreference.java
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidProfileSyncPreference.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile;
+package org.dspace.profile;
 
 /**
  * Enum that model the allowed values to configure the ORCID synchronization
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/OrcidSynchronizationMode.java b/dspace-api/src/main/java/org/dspace/profile/OrcidSynchronizationMode.java
similarity index 95%
rename from dspace-api/src/main/java/org/dspace/app/profile/OrcidSynchronizationMode.java
rename to dspace-api/src/main/java/org/dspace/profile/OrcidSynchronizationMode.java
index 306b537611..8bc822261b 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/OrcidSynchronizationMode.java
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidSynchronizationMode.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile;
+package org.dspace.profile;
 
 /**
  * Enum that model the allowed values to configure the ORCID synchronization
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/ResearcherProfile.java b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfile.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/profile/ResearcherProfile.java
rename to dspace-api/src/main/java/org/dspace/profile/ResearcherProfile.java
index a292f6caad..72e7dc8008 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/ResearcherProfile.java
+++ b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfile.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile;
+package org.dspace.profile;
 
 import static org.dspace.core.Constants.READ;
 import static org.dspace.eperson.Group.ANONYMOUS;
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/ResearcherProfileServiceImpl.java b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
similarity index 98%
rename from dspace-api/src/main/java/org/dspace/app/profile/ResearcherProfileServiceImpl.java
rename to dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
index bc22c40b1a..80bbd68fd1 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/ResearcherProfileServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile;
+package org.dspace.profile;
 
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
@@ -28,9 +28,6 @@ import javax.annotation.PostConstruct;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.dspace.app.exception.ResourceAlreadyExistsException;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.profile.service.AfterResearcherProfileCreationAction;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Collection;
@@ -51,6 +48,9 @@ import org.dspace.discovery.indexobject.IndexableCollection;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.service.GroupService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.service.AfterResearcherProfileCreationAction;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.util.UUIDUtils;
 import org.slf4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/service/AfterResearcherProfileCreationAction.java b/dspace-api/src/main/java/org/dspace/profile/service/AfterResearcherProfileCreationAction.java
similarity index 92%
rename from dspace-api/src/main/java/org/dspace/app/profile/service/AfterResearcherProfileCreationAction.java
rename to dspace-api/src/main/java/org/dspace/profile/service/AfterResearcherProfileCreationAction.java
index 3e8a4f394c..495fe59cdc 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/service/AfterResearcherProfileCreationAction.java
+++ b/dspace-api/src/main/java/org/dspace/profile/service/AfterResearcherProfileCreationAction.java
@@ -5,13 +5,13 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile.service;
+package org.dspace.profile.service;
 
 import java.sql.SQLException;
 
-import org.dspace.app.profile.ResearcherProfile;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.profile.ResearcherProfile;
 
 /**
  * Interface to mark classes that allow to perform additional logic on created
diff --git a/dspace-api/src/main/java/org/dspace/app/profile/service/ResearcherProfileService.java b/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
similarity index 97%
rename from dspace-api/src/main/java/org/dspace/app/profile/service/ResearcherProfileService.java
rename to dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
index 359f91761a..9e52402f77 100644
--- a/dspace-api/src/main/java/org/dspace/app/profile/service/ResearcherProfileService.java
+++ b/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
@@ -5,18 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.profile.service;
+package org.dspace.profile.service;
 
 import java.net.URI;
 import java.sql.SQLException;
 import java.util.UUID;
 
-import org.dspace.app.profile.ResearcherProfile;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.discovery.SearchServiceException;
 import org.dspace.eperson.EPerson;
+import org.dspace.profile.ResearcherProfile;
 
 /**
  * Service interface class for the {@link ResearcherProfile} object. The
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
index 4913dbd3a9..bae2dd11ae 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
@@ -60,9 +60,9 @@
         <property name="dspaceRunnableClass" value="org.dspace.scripts.impl.MockDSpaceRunnableScript"/>
     </bean>
     
-    <bean id="orcid-bulk-push" class="org.dspace.app.orcid.script.OrcidBulkPushScriptConfiguration">
+    <bean id="orcid-bulk-push" class="org.dspace.orcid.script.OrcidBulkPushScriptConfiguration">
         <property name="description" value="Perform the bulk synchronization of all the BATCH configured ORCID entities placed in the ORCID queue"/>
-        <property name="dspaceRunnableClass" value="org.dspace.app.orcid.script.OrcidBulkPush"/>
+        <property name="dspaceRunnableClass" value="org.dspace.orcid.script.OrcidBulkPush"/>
     </bean>
     
     <!-- Keep as last script; for test ScriptRestRepository#findOneScriptByNameTest -->
diff --git a/dspace-api/src/test/java/org/dspace/app/matcher/OrcidQueueMatcher.java b/dspace-api/src/test/java/org/dspace/app/matcher/OrcidQueueMatcher.java
index 08ed700c54..9f83301515 100644
--- a/dspace-api/src/test/java/org/dspace/app/matcher/OrcidQueueMatcher.java
+++ b/dspace-api/src/test/java/org/dspace/app/matcher/OrcidQueueMatcher.java
@@ -9,9 +9,9 @@ package org.dspace.app.matcher;
 
 import static org.hamcrest.Matchers.is;
 
-import org.dspace.app.orcid.OrcidOperation;
-import org.dspace.app.orcid.OrcidQueue;
 import org.dspace.content.Item;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
diff --git a/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java b/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
index a5eafc580a..3306ced8f4 100644
--- a/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
@@ -13,10 +13,6 @@ import java.util.List;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.app.orcid.factory.OrcidServiceFactory;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidTokenService;
 import org.dspace.app.requestitem.factory.RequestItemServiceFactory;
 import org.dspace.app.requestitem.service.RequestItemService;
 import org.dspace.authorize.AuthorizeException;
@@ -46,6 +42,10 @@ import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.eperson.service.RegistrationDataService;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.scripts.factory.ScriptServiceFactory;
 import org.dspace.scripts.service.ProcessService;
 import org.dspace.services.factory.DSpaceServicesFactory;
diff --git a/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
index 501f6e4569..f4d35aa3da 100644
--- a/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
@@ -15,9 +15,6 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
 
-import org.dspace.app.profile.OrcidEntitySyncPreference;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
-import org.dspace.app.profile.OrcidSynchronizationMode;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
 import org.dspace.content.DCDate;
@@ -29,6 +26,9 @@ import org.dspace.content.service.DSpaceObjectService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
 
 /**
  * Builder to construct Item objects
diff --git a/dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java b/dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java
index 0d8ce0a7bc..199f412f85 100644
--- a/dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java
@@ -12,12 +12,11 @@ import java.sql.SQLException;
 import java.util.Date;
 
 import org.apache.log4j.Logger;
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidOperation;
-import org.dspace.app.orcid.service.OrcidHistoryService;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
-
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.service.OrcidHistoryService;
 /**
  * Builder to construct OrcidHistory objects
  *
diff --git a/dspace-api/src/test/java/org/dspace/builder/OrcidQueueBuilder.java b/dspace-api/src/test/java/org/dspace/builder/OrcidQueueBuilder.java
index 4e71471ef0..bbc0e0e532 100644
--- a/dspace-api/src/test/java/org/dspace/builder/OrcidQueueBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/OrcidQueueBuilder.java
@@ -9,12 +9,12 @@ package org.dspace.builder;
 
 import java.sql.SQLException;
 
-import org.dspace.app.orcid.OrcidOperation;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.service.OrcidQueueService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidQueueService;
 
 /**
  * Builder to construct OrcidQueue objects
diff --git a/dspace-api/src/test/java/org/dspace/builder/OrcidTokenBuilder.java b/dspace-api/src/test/java/org/dspace/builder/OrcidTokenBuilder.java
index b6915fb1d8..e3e149a9ec 100644
--- a/dspace-api/src/test/java/org/dspace/builder/OrcidTokenBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/OrcidTokenBuilder.java
@@ -9,12 +9,12 @@ package org.dspace.builder;
 
 import java.sql.SQLException;
 
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.service.OrcidTokenService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.service.OrcidTokenService;
 
 /**
  * Builder for {@link OrcidToken} entities.
diff --git a/dspace-api/src/test/java/org/dspace/app/orcid/OrcidQueueConsumerIT.java b/dspace-api/src/test/java/org/dspace/orcid/OrcidQueueConsumerIT.java
similarity index 97%
rename from dspace-api/src/test/java/org/dspace/app/orcid/OrcidQueueConsumerIT.java
rename to dspace-api/src/test/java/org/dspace/orcid/OrcidQueueConsumerIT.java
index 4d1ac78c57..2d68bf1d70 100644
--- a/dspace-api/src/test/java/org/dspace/app/orcid/OrcidQueueConsumerIT.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/OrcidQueueConsumerIT.java
@@ -5,19 +5,19 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid;
+package org.dspace.orcid;
 
 import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
-import static org.dspace.app.orcid.OrcidOperation.DELETE;
-import static org.dspace.app.orcid.OrcidOperation.INSERT;
-import static org.dspace.app.orcid.OrcidOperation.UPDATE;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.KEYWORDS;
-import static org.dspace.app.profile.OrcidEntitySyncPreference.ALL;
-import static org.dspace.app.profile.OrcidEntitySyncPreference.DISABLED;
-import static org.dspace.app.profile.OrcidProfileSyncPreference.BIOGRAPHICAL;
-import static org.dspace.app.profile.OrcidProfileSyncPreference.IDENTIFIERS;
 import static org.dspace.builder.OrcidHistoryBuilder.createOrcidHistory;
 import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
+import static org.dspace.orcid.OrcidOperation.DELETE;
+import static org.dspace.orcid.OrcidOperation.INSERT;
+import static org.dspace.orcid.OrcidOperation.UPDATE;
+import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
+import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
+import static org.dspace.profile.OrcidEntitySyncPreference.DISABLED;
+import static org.dspace.profile.OrcidProfileSyncPreference.BIOGRAPHICAL;
+import static org.dspace.profile.OrcidProfileSyncPreference.IDENTIFIERS;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
@@ -30,9 +30,6 @@ import java.util.Date;
 import java.util.List;
 
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.orcid.consumer.OrcidQueueConsumer;
-import org.dspace.app.orcid.factory.OrcidServiceFactory;
-import org.dspace.app.orcid.service.OrcidQueueService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
@@ -47,6 +44,9 @@ import org.dspace.content.MetadataValue;
 import org.dspace.content.RelationshipType;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
+import org.dspace.orcid.consumer.OrcidQueueConsumer;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.service.OrcidQueueService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.junit.After;
diff --git a/dspace-api/src/test/java/org/dspace/app/orcid/model/validator/OrcidValidatorTest.java b/dspace-api/src/test/java/org/dspace/orcid/model/validator/OrcidValidatorTest.java
similarity index 94%
rename from dspace-api/src/test/java/org/dspace/app/orcid/model/validator/OrcidValidatorTest.java
rename to dspace-api/src/test/java/org/dspace/orcid/model/validator/OrcidValidatorTest.java
index fbb1a56109..f90aa856a9 100644
--- a/dspace-api/src/test/java/org/dspace/app/orcid/model/validator/OrcidValidatorTest.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/model/validator/OrcidValidatorTest.java
@@ -5,22 +5,22 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.model.validator;
+package org.dspace.orcid.model.validator;
 
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.when;
 
 import java.util.List;
 
-import org.dspace.app.orcid.model.validator.impl.OrcidValidatorImpl;
+import org.dspace.orcid.model.validator.impl.OrcidValidatorImpl;
 import org.dspace.services.ConfigurationService;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/dspace-api/src/test/java/org/dspace/app/orcid/script/OrcidBulkPushIT.java b/dspace-api/src/test/java/org/dspace/orcid/script/OrcidBulkPushIT.java
similarity index 96%
rename from dspace-api/src/test/java/org/dspace/app/orcid/script/OrcidBulkPushIT.java
rename to dspace-api/src/test/java/org/dspace/orcid/script/OrcidBulkPushIT.java
index f27e954a77..db66f6c7aa 100644
--- a/dspace-api/src/test/java/org/dspace/app/orcid/script/OrcidBulkPushIT.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/script/OrcidBulkPushIT.java
@@ -5,17 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.script;
+package org.dspace.orcid.script;
 
 import static org.dspace.app.launcher.ScriptLauncher.handleScript;
 import static org.dspace.app.matcher.LambdaMatcher.matches;
 import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
-import static org.dspace.app.orcid.OrcidOperation.DELETE;
-import static org.dspace.app.orcid.OrcidOperation.INSERT;
-import static org.dspace.app.orcid.OrcidOperation.UPDATE;
-import static org.dspace.app.profile.OrcidSynchronizationMode.BATCH;
-import static org.dspace.app.profile.OrcidSynchronizationMode.MANUAL;
 import static org.dspace.builder.OrcidQueueBuilder.createOrcidQueue;
+import static org.dspace.orcid.OrcidOperation.DELETE;
+import static org.dspace.orcid.OrcidOperation.INSERT;
+import static org.dspace.orcid.OrcidOperation.UPDATE;
+import static org.dspace.profile.OrcidSynchronizationMode.BATCH;
+import static org.dspace.profile.OrcidSynchronizationMode.MANUAL;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -37,16 +37,6 @@ import java.util.function.Predicate;
 import org.apache.commons.lang3.ArrayUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.app.launcher.ScriptLauncher;
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidOperation;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidResponse;
-import org.dspace.app.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.factory.OrcidServiceFactory;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.impl.OrcidHistoryServiceImpl;
-import org.dspace.app.profile.OrcidSynchronizationMode;
 import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
@@ -56,6 +46,16 @@ import org.dspace.builder.OrcidTokenBuilder;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidResponse;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.impl.OrcidHistoryServiceImpl;
+import org.dspace.profile.OrcidSynchronizationMode;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.junit.After;
diff --git a/dspace-api/src/test/java/org/dspace/app/orcid/service/OrcidEntityFactoryServiceIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
similarity index 99%
rename from dspace-api/src/test/java/org/dspace/app/orcid/service/OrcidEntityFactoryServiceIT.java
rename to dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
index 69056d5c68..7ce440e3a2 100644
--- a/dspace-api/src/test/java/org/dspace/app/orcid/service/OrcidEntityFactoryServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import static org.apache.commons.lang.StringUtils.endsWith;
 import static org.dspace.app.matcher.LambdaMatcher.has;
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.function.Predicate;
 
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.orcid.factory.OrcidServiceFactory;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.EntityTypeBuilder;
@@ -38,6 +37,7 @@ import org.dspace.content.Collection;
 import org.dspace.content.EntityType;
 import org.dspace.content.Item;
 import org.dspace.content.RelationshipType;
+import org.dspace.orcid.factory.OrcidServiceFactory;
 import org.junit.Before;
 import org.junit.Test;
 import org.orcid.jaxb.model.common.ContributorRole;
diff --git a/dspace-api/src/test/java/org/dspace/app/orcid/service/OrcidProfileSectionFactoryServiceIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
similarity index 94%
rename from dspace-api/src/test/java/org/dspace/app/orcid/service/OrcidProfileSectionFactoryServiceIT.java
rename to dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
index 38e51cf566..47bb675703 100644
--- a/dspace-api/src/test/java/org/dspace/app/orcid/service/OrcidProfileSectionFactoryServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
@@ -5,14 +5,14 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import static org.dspace.app.matcher.LambdaMatcher.matches;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.COUNTRY;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.KEYWORDS;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.COUNTRY;
+import static org.dspace.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
+import static org.dspace.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.greaterThan;
@@ -26,9 +26,6 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.orcid.factory.OrcidServiceFactory;
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.ItemBuilder;
@@ -37,6 +34,9 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
 import org.junit.Before;
 import org.junit.Test;
 import org.orcid.jaxb.model.common.Iso3166Country;
diff --git a/dspace-api/src/test/java/org/dspace/app/orcid/service/PlainMetadataSignatureGeneratorIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/PlainMetadataSignatureGeneratorIT.java
similarity index 98%
rename from dspace-api/src/test/java/org/dspace/app/orcid/service/PlainMetadataSignatureGeneratorIT.java
rename to dspace-api/src/test/java/org/dspace/orcid/service/PlainMetadataSignatureGeneratorIT.java
index 915af245bf..638bfdfc57 100644
--- a/dspace-api/src/test/java/org/dspace/app/orcid/service/PlainMetadataSignatureGeneratorIT.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/PlainMetadataSignatureGeneratorIT.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.orcid.service;
+package org.dspace.orcid.service;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.anyOf;
@@ -19,7 +19,6 @@ import static org.hamcrest.Matchers.notNullValue;
 import java.util.List;
 
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.orcid.service.impl.PlainMetadataSignatureGeneratorImpl;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.ItemBuilder;
@@ -28,6 +27,7 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
+import org.dspace.orcid.service.impl.PlainMetadataSignatureGeneratorImpl;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
index 91974659a9..9642bb4a2d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
@@ -11,7 +11,6 @@ import java.sql.SQLException;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.rest.authorization.AuthorizationFeature;
 import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
 import org.dspace.app.rest.model.BaseObjectRest;
@@ -22,6 +21,7 @@ import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidHistoryRestConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidHistoryRestConverter.java
index b1af3fdaa4..5399e6d396 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidHistoryRestConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidHistoryRestConverter.java
@@ -7,9 +7,9 @@
  */
 package org.dspace.app.rest.converter;
 
-import org.dspace.app.orcid.OrcidHistory;
 import org.dspace.app.rest.model.OrcidHistoryRest;
 import org.dspace.app.rest.projection.Projection;
+import org.dspace.orcid.OrcidHistory;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidQueueRestConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidQueueRestConverter.java
index d1d3753fda..755e43a577 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidQueueRestConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidQueueRestConverter.java
@@ -7,10 +7,10 @@
  */
 package org.dspace.app.rest.converter;
 
-import org.dspace.app.orcid.OrcidQueue;
 import org.dspace.app.rest.model.OrcidQueueRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.Item;
+import org.dspace.orcid.OrcidQueue;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResearcherProfileConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResearcherProfileConverter.java
index 606a622ff7..54dffa5788 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResearcherProfileConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResearcherProfileConverter.java
@@ -7,22 +7,22 @@
  */
 package org.dspace.app.rest.converter;
 
-import static org.dspace.app.orcid.model.OrcidEntityType.FUNDING;
-import static org.dspace.app.orcid.model.OrcidEntityType.PUBLICATION;
+import static org.dspace.orcid.model.OrcidEntityType.FUNDING;
+import static org.dspace.orcid.model.OrcidEntityType.PUBLICATION;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.profile.OrcidEntitySyncPreference;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
-import org.dspace.app.profile.OrcidSynchronizationMode;
-import org.dspace.app.profile.ResearcherProfile;
 import org.dspace.app.rest.model.ResearcherProfileRest;
 import org.dspace.app.rest.model.ResearcherProfileRest.OrcidSynchronizationRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
+import org.dspace.profile.ResearcherProfile;
 import org.dspace.web.ContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
index 95ddae5829..7bb62d986f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
@@ -21,10 +21,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.exception.ResourceAlreadyExistsException;
-import org.dspace.app.orcid.exception.OrcidValidationException;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
+import org.dspace.orcid.exception.OrcidValidationException;
 import org.dspace.services.ConfigurationService;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.core.annotation.AnnotationUtils;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
index 4d7242342d..1450c12f90 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
@@ -18,7 +18,6 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.rest.login.PostLoggedInAction;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
@@ -27,6 +26,7 @@ import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
index 5898e65cff..0c44baaf0d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
@@ -11,14 +11,14 @@ import java.sql.SQLException;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.service.OrcidHistoryService;
 import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
 import org.dspace.app.rest.model.OrcidHistoryRest;
 import org.dspace.app.rest.repository.handler.service.UriListHandlerService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.domain.Page;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
index 2812e590e1..0a1614cded 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
@@ -13,14 +13,14 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.service.OrcidQueueService;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
 import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
 import org.dspace.app.rest.model.OrcidQueueRest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidQueueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.domain.Page;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
index af7729f8f2..92bbf6996d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
@@ -12,8 +12,6 @@ import java.util.UUID;
 import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 
-import org.dspace.app.profile.ResearcherProfile;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.rest.model.EPersonRest;
 import org.dspace.app.rest.model.ResearcherProfileRest;
 import org.dspace.app.rest.projection.Projection;
@@ -21,6 +19,8 @@ import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
index 827d554149..5f212b966f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
@@ -12,13 +12,13 @@ import java.util.UUID;
 import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 
-import org.dspace.app.profile.ResearcherProfile;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.ResearcherProfileRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
index dee78f1fce..37717f6268 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
@@ -14,8 +14,6 @@ import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.dspace.app.profile.ResearcherProfile;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
@@ -28,6 +26,8 @@ import org.dspace.core.Context;
 import org.dspace.discovery.SearchServiceException;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.dspace.util.UUIDUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
index 67e7f9f3ec..0965058449 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
@@ -13,10 +13,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.service.OrcidQueueService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidQueueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileAddOrcidOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileAddOrcidOperation.java
index bdc0f245b5..976d057915 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileAddOrcidOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileAddOrcidOperation.java
@@ -9,14 +9,14 @@ package org.dspace.app.rest.repository.patch.operation;
 
 import java.sql.SQLException;
 
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.profile.ResearcherProfile;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.core.Context;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.ResearcherProfile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileRemoveOrcidOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileRemoveOrcidOperation.java
index d1ed635a02..992ad6afb2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileRemoveOrcidOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileRemoveOrcidOperation.java
@@ -7,23 +7,23 @@
  */
 package org.dspace.app.rest.repository.patch.operation;
 
-import static org.dspace.app.profile.OrcidProfileDisconnectionMode.ADMIN_AND_OWNER;
-import static org.dspace.app.profile.OrcidProfileDisconnectionMode.DISABLED;
-import static org.dspace.app.profile.OrcidProfileDisconnectionMode.ONLY_ADMIN;
-import static org.dspace.app.profile.OrcidProfileDisconnectionMode.ONLY_OWNER;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.ADMIN_AND_OWNER;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.DISABLED;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.ONLY_ADMIN;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.ONLY_OWNER;
 
 import java.sql.SQLException;
 
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.profile.OrcidProfileDisconnectionMode;
-import org.dspace.app.profile.ResearcherProfile;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.rest.exception.RESTAuthorizationException;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.OrcidProfileDisconnectionMode;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileReplaceOrcidSyncPreferencesOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileReplaceOrcidSyncPreferencesOperation.java
index d7092a2e29..5084931382 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileReplaceOrcidSyncPreferencesOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileReplaceOrcidSyncPreferencesOperation.java
@@ -7,8 +7,8 @@
  */
 package org.dspace.app.rest.repository.patch.operation;
 
-import static org.dspace.app.orcid.model.OrcidEntityType.FUNDING;
-import static org.dspace.app.orcid.model.OrcidEntityType.PUBLICATION;
+import static org.dspace.orcid.model.OrcidEntityType.FUNDING;
+import static org.dspace.orcid.model.OrcidEntityType.PUBLICATION;
 
 import java.sql.SQLException;
 import java.util.Arrays;
@@ -16,14 +16,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.app.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.profile.OrcidEntitySyncPreference;
-import org.dspace.app.profile.OrcidProfileSyncPreference;
-import org.dspace.app.profile.OrcidSynchronizationMode;
-import org.dspace.app.profile.ResearcherProfile;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.rest.exception.RESTAuthorizationException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.patch.Operation;
@@ -31,6 +23,14 @@ import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileVisibleReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileVisibleReplaceOperation.java
index 4052fe5395..3e3c0c82f2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileVisibleReplaceOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileVisibleReplaceOperation.java
@@ -9,13 +9,13 @@ package org.dspace.app.rest.repository.patch.operation;
 
 import java.sql.SQLException;
 
-import org.dspace.app.profile.ResearcherProfile;
-import org.dspace.app.profile.service.ResearcherProfileService;
 import org.dspace.app.rest.exception.RESTAuthorizationException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin.java
index 8987639292..9f6d836952 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin.java
@@ -13,14 +13,14 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.service.OrcidQueueService;
 import org.dspace.app.rest.model.OrcidQueueRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidQueueService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
index 6de48e66bf..0139f3b336 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
@@ -11,15 +11,15 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
 import org.slf4j.Logger;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
index bf8b1ca87f..1b95837588 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
@@ -42,9 +42,6 @@ import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.IOUtils;
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidConfiguration;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
 import org.dspace.app.rest.authorization.Authorization;
 import org.dspace.app.rest.authorization.AuthorizationFeature;
 import org.dspace.app.rest.authorization.AuthorizationFeatureService;
@@ -74,6 +71,9 @@ import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
 import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
 import org.junit.Before;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
index cd1302789e..801976be9f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
@@ -10,13 +10,13 @@ package org.dspace.app.rest;
 import static com.jayway.jsonpath.JsonPath.read;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
-import static org.dspace.app.orcid.OrcidOperation.DELETE;
-import static org.dspace.app.profile.OrcidEntitySyncPreference.ALL;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
 import static org.dspace.builder.OrcidHistoryBuilder.createOrcidHistory;
 import static org.dspace.builder.OrcidQueueBuilder.createOrcidQueue;
 import static org.dspace.core.Constants.WRITE;
+import static org.dspace.orcid.OrcidOperation.DELETE;
+import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
@@ -48,10 +48,6 @@ import javax.ws.rs.core.MediaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.CharEncoding;
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
 import org.dspace.app.rest.matcher.BitstreamMatcher;
 import org.dspace.app.rest.matcher.BundleMatcher;
 import org.dspace.app.rest.matcher.CollectionMatcher;
@@ -93,6 +89,10 @@ import org.dspace.content.service.CollectionService;
 import org.dspace.core.Constants;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.versioning.Version;
 import org.dspace.versioning.service.VersioningService;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
index 12ea16b659..4b441b1bc8 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
@@ -34,11 +34,6 @@ import javax.servlet.http.Cookie;
 import com.jayway.jsonpath.JsonPath;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jwt.SignedJWT;
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
-import org.dspace.app.orcid.service.OrcidTokenService;
 import org.dspace.app.rest.model.AuthnRest;
 import org.dspace.app.rest.security.OrcidLoginFilter;
 import org.dspace.app.rest.security.jwt.EPersonClaimProvider;
@@ -52,6 +47,11 @@ import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.util.UUIDUtils;
 import org.junit.After;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
index 0b6b27e759..f66f68b958 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
@@ -13,13 +13,13 @@ import static java.util.Arrays.asList;
 import static java.util.UUID.fromString;
 import static org.dspace.app.matcher.LambdaMatcher.has;
 import static org.dspace.app.matcher.MetadataValueMatcher.with;
-import static org.dspace.app.profile.OrcidEntitySyncPreference.ALL;
 import static org.dspace.app.rest.matcher.HalMatcher.matchLinks;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataNotEmpty;
 import static org.dspace.app.rest.matcher.ResourcePolicyMatcher.matchResourcePolicyProperties;
 import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
+import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
@@ -51,13 +51,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 
 import com.jayway.jsonpath.JsonPath;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.OrcidToken;
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
-import org.dspace.app.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidTokenService;
 import org.dspace.app.rest.model.patch.AddOperation;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.model.patch.RemoveOperation;
@@ -80,6 +73,13 @@ import org.dspace.content.RelationshipType;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.util.UUIDUtils;
 import org.junit.After;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidHistoryMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidHistoryMatcher.java
index 327826a20c..746e41673a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidHistoryMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidHistoryMatcher.java
@@ -11,7 +11,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
 
-import org.dspace.app.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidHistory;
 import org.hamcrest.Matcher;
 
 /**
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidQueueMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidQueueMatcher.java
index 7ca5e29b01..f38b0d2ba9 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidQueueMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidQueueMatcher.java
@@ -12,8 +12,7 @@ import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.content.Item;
+import org.dspace.orcid.OrcidQueue;
 import org.hamcrest.Matcher;
 
 /**
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidHistoryRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidHistoryRestRepositoryIT.java
index e0435bdced..0c0dbd7144 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidHistoryRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidHistoryRestRepositoryIT.java
@@ -32,13 +32,6 @@ import java.sql.SQLException;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 
-import org.dspace.app.orcid.OrcidHistory;
-import org.dspace.app.orcid.OrcidOperation;
-import org.dspace.app.orcid.OrcidQueue;
-import org.dspace.app.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidResponse;
-import org.dspace.app.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.service.impl.OrcidHistoryServiceImpl;
 import org.dspace.app.rest.matcher.OrcidHistoryMatcher;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.authorize.AuthorizeException;
@@ -56,6 +49,13 @@ import org.dspace.content.EntityType;
 import org.dspace.content.Item;
 import org.dspace.content.RelationshipType;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidResponse;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.service.impl.OrcidHistoryServiceImpl;
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java
index eaa55af2ae..14dc4e95dc 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java
@@ -16,7 +16,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.dspace.app.orcid.OrcidQueue;
 import org.dspace.app.rest.matcher.OrcidQueueMatcher;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.builder.CollectionBuilder;
@@ -28,6 +27,7 @@ import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
 import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidQueue;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index 8aeb197b7b..0ea77879dc 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -792,7 +792,7 @@ event.consumer.iiif.class = org.dspace.iiif.consumer.IIIFCacheEventConsumer
 event.consumer.iiif.filters = Item+Modify:Item+Modify_Metadata:Item+Delete:Item+Remove:Bundle+ALL:Bitstream+All
 
 #orcid queue consumer
-event.consumer.orcidqueue.class = org.dspace.app.orcid.consumer.OrcidQueueConsumer
+event.consumer.orcidqueue.class = org.dspace.orcid.consumer.OrcidQueueConsumer
 event.consumer.orcidqueue.filters = Item+Install|Modify|Modify_Metadata|Delete|Remove
 
 # ...set to true to enable testConsumer messages to standard output
diff --git a/dspace/config/hibernate.cfg.xml b/dspace/config/hibernate.cfg.xml
index 3d18178239..085ed0bd6e 100644
--- a/dspace/config/hibernate.cfg.xml
+++ b/dspace/config/hibernate.cfg.xml
@@ -89,9 +89,9 @@
 
         <mapping class="org.dspace.statistics.export.OpenURLTracker"/>
         
-        <mapping class="org.dspace.app.orcid.OrcidQueue" />
-        <mapping class="org.dspace.app.orcid.OrcidHistory" />
-        <mapping class="org.dspace.app.orcid.OrcidToken"/>
+        <mapping class="org.dspace.orcid.OrcidQueue" />
+        <mapping class="org.dspace.orcid.OrcidHistory" />
+        <mapping class="org.dspace.orcid.OrcidToken"/>
 
     </session-factory>
 </hibernate-configuration>
diff --git a/dspace/config/spring/api/core-dao-services.xml b/dspace/config/spring/api/core-dao-services.xml
index df1971dbc9..ae4b5e6e3b 100644
--- a/dspace/config/spring/api/core-dao-services.xml
+++ b/dspace/config/spring/api/core-dao-services.xml
@@ -61,8 +61,8 @@
     <bean class="org.dspace.xmlworkflow.storedcomponents.dao.impl.XmlWorkflowItemDAOImpl"/>
     <bean class="org.dspace.statistics.export.dao.impl.OpenURLTrackerDAOImpl"/>
  	
-    <bean class="org.dspace.app.orcid.dao.impl.OrcidQueueDAOImpl" />
-    <bean class="org.dspace.app.orcid.dao.impl.OrcidHistoryDAOImpl" />
+    <bean class="org.dspace.orcid.dao.impl.OrcidQueueDAOImpl" />
+    <bean class="org.dspace.orcid.dao.impl.OrcidHistoryDAOImpl" />
 
 
 </beans>
diff --git a/dspace/config/spring/api/core-factory-services.xml b/dspace/config/spring/api/core-factory-services.xml
index f7161d1936..44a9b103bd 100644
--- a/dspace/config/spring/api/core-factory-services.xml
+++ b/dspace/config/spring/api/core-factory-services.xml
@@ -51,6 +51,6 @@
 
     <bean id="openURLTrackerLoggerServiceFactory" class="org.dspace.statistics.export.factory.OpenURLTrackerLoggerServiceFactoryImpl"/>
     
-    <bean id="orcidServiceFactory" class="org.dspace.app.orcid.factory.OrcidServiceFactoryImpl"/>
+    <bean id="orcidServiceFactory" class="org.dspace.orcid.factory.OrcidServiceFactoryImpl"/>
 
 </beans>
diff --git a/dspace/config/spring/api/core-services.xml b/dspace/config/spring/api/core-services.xml
index 34f8829337..de55e16031 100644
--- a/dspace/config/spring/api/core-services.xml
+++ b/dspace/config/spring/api/core-services.xml
@@ -63,9 +63,9 @@
     <bean class="org.dspace.content.authority.ChoiceAuthorityServiceImpl"/>
     <bean class="org.dspace.content.authority.MetadataAuthorityServiceImpl" lazy-init="true"/>
 
-    <bean class="org.dspace.app.profile.ResearcherProfileServiceImpl"/>
+    <bean class="org.dspace.profile.ResearcherProfileServiceImpl"/>
 
-    <bean class="org.dspace.app.profile.OrcidMetadataCopyingAction"/>
+    <bean class="org.dspace.profile.OrcidMetadataCopyingAction"/>
 
     <bean class='org.dspace.service.impl.HttpConnectionPoolService'
           id='solrHttpConnectionPoolService'
diff --git a/dspace/config/spring/api/orcid-services.xml b/dspace/config/spring/api/orcid-services.xml
index e9f25fc8ac..4a2e7e93b8 100644
--- a/dspace/config/spring/api/orcid-services.xml
+++ b/dspace/config/spring/api/orcid-services.xml
@@ -9,18 +9,18 @@
 
     <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
 
-    <bean class="org.dspace.app.orcid.service.impl.OrcidQueueServiceImpl" />
-    <bean class="org.dspace.app.orcid.service.impl.OrcidHistoryServiceImpl" />
+    <bean class="org.dspace.orcid.service.impl.OrcidQueueServiceImpl" />
+    <bean class="org.dspace.orcid.service.impl.OrcidHistoryServiceImpl" />
     
-    <bean class="org.dspace.app.orcid.service.impl.OrcidSynchronizationServiceImpl"/>
+    <bean class="org.dspace.orcid.service.impl.OrcidSynchronizationServiceImpl"/>
     
-    <bean class="org.dspace.app.orcid.dao.impl.OrcidTokenDAOImpl"/>
+    <bean class="org.dspace.orcid.dao.impl.OrcidTokenDAOImpl"/>
     
-    <bean id="org.dspace.app.orcid.service.OrcidTokenService" class="org.dspace.app.orcid.service.impl.OrcidTokenServiceImpl"/>
+    <bean id="org.dspace.orcid.service.OrcidTokenService" class="org.dspace.orcid.service.impl.OrcidTokenServiceImpl"/>
     
     <bean class="org.dspace.authenticate.OrcidAuthenticationBean" id="orcidAuthentication"/>
     
-    <bean class="org.dspace.app.orcid.client.OrcidConfiguration">
+    <bean class="org.dspace.orcid.client.OrcidConfiguration">
     	<property name="apiUrl" value="${orcid.api-url}" />
     	<property name="publicUrl" value="${orcid.public-url}" />
     	<property name="domainUrl" value="${orcid.domain-url}" />
@@ -32,26 +32,26 @@
     	<property name="scopes" value="${orcid.scope}" />
     </bean>
     
-    <bean class="org.dspace.app.orcid.client.OrcidClientImpl" />
-    <bean id="metadataSignatureGenerator" class="org.dspace.app.orcid.service.impl.PlainMetadataSignatureGeneratorImpl" />
+    <bean class="org.dspace.orcid.client.OrcidClientImpl" />
+    <bean id="metadataSignatureGenerator" class="org.dspace.orcid.service.impl.PlainMetadataSignatureGeneratorImpl" />
     
-    <bean class="org.dspace.app.orcid.model.validator.impl.OrcidValidatorImpl" />
+    <bean class="org.dspace.orcid.model.validator.impl.OrcidValidatorImpl" />
     
-    <bean class="org.dspace.app.orcid.service.impl.OrcidEntityFactoryServiceImpl">
+    <bean class="org.dspace.orcid.service.impl.OrcidEntityFactoryServiceImpl">
     	<constructor-arg name="itemService" ref="org.dspace.content.ItemServiceImpl" />
     	<constructor-arg name="entityFactories">
     		<list>
-    			<bean class="org.dspace.app.orcid.model.factory.impl.OrcidWorkFactory">
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidWorkFactory">
     				<property name="fieldMapping" ref="orcidWorkFactoryFieldMapping" />
     			</bean>
-    			<bean class="org.dspace.app.orcid.model.factory.impl.OrcidFundingFactory">
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidFundingFactory">
     				<property name="fieldMapping" ref="orcidFundingFactoryFieldMapping" />
     			</bean>
     		</list>
    		</constructor-arg>
 	</bean>
 	
-	<bean id="orcidWorkFactoryFieldMapping" class="org.dspace.app.orcid.model.OrcidWorkFieldMapping" >
+	<bean id="orcidWorkFactoryFieldMapping" class="org.dspace.orcid.model.OrcidWorkFieldMapping" >
 		<property name="contributorFields" value="${orcid.mapping.work.contributors}" />
 		<property name="externalIdentifierFields" value="${orcid.mapping.work.external-ids}" />
 		<property name="publicationDateField" value="${orcid.mapping.work.publication-date}" />
@@ -65,7 +65,7 @@
 		<property name="typeConverter" ref="${orcid.mapping.work.type.converter}" />
 	</bean>
 	
-	<bean id="orcidFundingFactoryFieldMapping" class="org.dspace.app.orcid.model.OrcidFundingFieldMapping" >
+	<bean id="orcidFundingFactoryFieldMapping" class="org.dspace.orcid.model.OrcidFundingFieldMapping" >
 		<property name="contributorFields" value="${orcid.mapping.funding.contributors}" />
 		<property name="externalIdentifierFields" value="${orcid.mapping.funding.external-ids}" />
 		<property name="titleField" value="${orcid.mapping.funding.title}" />
@@ -80,7 +80,7 @@
 		<property name="organizationRelationshipType" value="${orcid.mapping.funding.organization-relationship-type}" />
 	</bean>
     
-    <bean class="org.dspace.app.orcid.model.factory.impl.OrcidCommonObjectFactoryImpl">
+    <bean class="org.dspace.orcid.model.factory.impl.OrcidCommonObjectFactoryImpl">
     	<property name="contributorEmailField" value="${orcid.mapping.contributor.email}" />
     	<property name="contributorOrcidField" value="${orcid.mapping.contributor.orcid}" />
         <property name="organizationTitleField" value="${orcid.mapping.organization.title}" />
@@ -91,35 +91,35 @@
     
     <!-- Configuration of ORCID profile sections factory. 
     Each entry of sectionFactories must be an implementation of OrcidProfileSectionFactory.-->
-    <bean class="org.dspace.app.orcid.service.impl.OrcidProfileSectionFactoryServiceImpl">
+    <bean class="org.dspace.orcid.service.impl.OrcidProfileSectionFactoryServiceImpl">
     	<constructor-arg name="sectionFactories">
     		<list>
     		
-    			<bean class="org.dspace.app.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
 					<constructor-arg name="sectionType" value="OTHER_NAMES" />
 					<constructor-arg name="preference" value="BIOGRAPHICAL" />
 					<property name="metadataFields" value="${orcid.mapping.other-names}" />
 				</bean>
 				
-    			<bean class="org.dspace.app.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
 					<constructor-arg name="sectionType" value="KEYWORDS" />
 					<constructor-arg name="preference" value="BIOGRAPHICAL" />
 					<property name="metadataFields" value="${orcid.mapping.keywords}" />
 				</bean>
 				
-    			<bean class="org.dspace.app.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
 					<constructor-arg name="sectionType" value="COUNTRY" />
 					<constructor-arg name="preference" value="BIOGRAPHICAL" />
 					<property name="metadataFields" value="${orcid.mapping.country}" />
 				</bean>
 				
-    			<bean class="org.dspace.app.orcid.model.factory.impl.OrcidPersonExternalIdentifierFactory">
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidPersonExternalIdentifierFactory">
 					<constructor-arg name="sectionType" value="EXTERNAL_IDS" />
 					<constructor-arg name="preference" value="IDENTIFIERS" />
 					<property name="externalIds" value="${orcid.mapping.person-external-ids}" />
 				</bean>
 				
-    			<bean class="org.dspace.app.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
 					<constructor-arg name="sectionType" value="RESEARCHER_URLS" />
 					<constructor-arg name="preference" value="IDENTIFIERS" />
 					<property name="metadataFields" value="${orcid.mapping.researcher-urls}" />
diff --git a/dspace/config/spring/api/scripts.xml b/dspace/config/spring/api/scripts.xml
index faec6ed082..d5f869316d 100644
--- a/dspace/config/spring/api/scripts.xml
+++ b/dspace/config/spring/api/scripts.xml
@@ -56,9 +56,9 @@
         <property name="dspaceRunnableClass" value="org.dspace.app.mediafilter.MediaFilterScript"/>
     </bean>
     
-    <bean id="orcid-bulk-push" class="org.dspace.app.orcid.script.OrcidBulkPushScriptConfiguration">
+    <bean id="orcid-bulk-push" class="org.dspace.orcid.script.OrcidBulkPushScriptConfiguration">
         <property name="description" value="Perform the bulk synchronization of all the BATCH configured ORCID entities placed in the ORCID queue"/>
-        <property name="dspaceRunnableClass" value="org.dspace.app.orcid.script.OrcidBulkPush"/>
+        <property name="dspaceRunnableClass" value="org.dspace.orcid.script.OrcidBulkPush"/>
     </bean>
     
     <bean id="solr-database-resync" class="org.dspace.app.solrdatabaseresync.SolrDatabaseResyncCliScriptConfiguration">
diff --git a/dspace/config/spring/rest/scripts.xml b/dspace/config/spring/rest/scripts.xml
index bdf6bb2ef1..977f5d8cd4 100644
--- a/dspace/config/spring/rest/scripts.xml
+++ b/dspace/config/spring/rest/scripts.xml
@@ -39,9 +39,9 @@
         <property name="dspaceRunnableClass" value="org.dspace.app.harvest.Harvest"/>
     </bean>
     
-    <bean id="orcid-bulk-push" class="org.dspace.app.orcid.script.OrcidBulkPushScriptConfiguration" primary="true">
+    <bean id="orcid-bulk-push" class="org.dspace.orcid.script.OrcidBulkPushScriptConfiguration" primary="true">
         <property name="description" value="Perform the bulk synchronization of all the BATCH configured ORCID entities placed in the ORCID queue"/>
-        <property name="dspaceRunnableClass" value="org.dspace.app.orcid.script.OrcidBulkPush"/>
+        <property name="dspaceRunnableClass" value="org.dspace.orcid.script.OrcidBulkPush"/>
     </bean>
     
     <bean name="metadata-export-search" class="org.dspace.app.bulkedit.MetadataExportSearchScriptConfiguration">