[CST-5587] Moved org.dspace.app.orcid and org.dspace.app.profile into org.dspace.orcid and org.dspace.profile

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;

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;

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;

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;

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.

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;

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;

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.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
 import org.orcid.jaxb.model.v3.release.record.Person;
 
 /**

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.orcid.exception.OrcidClientException;
-import org.dspace.app.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidEntityType;
-import org.dspace.app.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.OrcidProfileSectionType;
-import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
+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;

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;
 

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;
 

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;

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

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

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

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}.

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}.

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}.

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

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

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.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.client.OrcidConfiguration;
-import org.dspace.app.orcid.service.MetadataSignatureGenerator;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
-import org.dspace.app.orcid.service.OrcidEntityFactoryService;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
-import org.dspace.app.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.orcid.service.OrcidTokenService;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**

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.orcid.client.OrcidClient;
-import org.dspace.app.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.client.OrcidConfiguration;
-import org.dspace.app.orcid.service.MetadataSignatureGenerator;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
-import org.dspace.app.orcid.service.OrcidEntityFactoryService;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
-import org.dspace.app.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidHistoryService;
-import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
-import org.dspace.app.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidQueueService;
-import org.dspace.app.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
-import org.dspace.app.orcid.service.OrcidTokenService;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**

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;
 

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;
 

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;
 

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;

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;

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;

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;
 
 /**

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;

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.

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;
 
 /**

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;

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;

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.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
-import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+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;

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.orcid.model.OrcidProfileSectionType.COUNTRY;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.KEYWORDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
+import static org.dspace.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
+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;

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;

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

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;
 

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.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
+import static org.dspace.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.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.orcid.model.validator.OrcidValidationError;
-import org.dspace.app.orcid.model.validator.OrcidValidator;
+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;

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.profile.OrcidSynchronizationMode.BATCH;
-import static org.dspace.app.profile.OrcidSynchronizationMode.MANUAL;
+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;

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;
 

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;
 

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;

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.

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

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.

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

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.

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;
 
 /**

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;

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}.

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;
 
 /**

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;
 

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;
 
 /**

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

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

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;

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;
 

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

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

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;

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;

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

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

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 -->

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;

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;

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

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
  *

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

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.

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;

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.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
-import static org.dspace.app.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
+import static org.dspace.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.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;

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;

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;

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.orcid.model.OrcidProfileSectionType.COUNTRY;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.KEYWORDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
+import static org.dspace.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
-import static org.dspace.app.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
+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;

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;
 

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;

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;
 
 /**

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;
 
 /**

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.orcid.model.OrcidEntityType.FUNDING;
-import static org.dspace.app.orcid.model.OrcidEntityType.PUBLICATION;
+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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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.profile.OrcidProfileDisconnectionMode.ADMIN_AND_OWNER;
-import static org.dspace.app.profile.OrcidProfileDisconnectionMode.DISABLED;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.DISABLED;
-import static org.dspace.app.profile.OrcidProfileDisconnectionMode.ONLY_ADMIN;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.ONLY_ADMIN;
-import static org.dspace.app.profile.OrcidProfileDisconnectionMode.ONLY_OWNER;
+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;
 

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.orcid.model.OrcidEntityType.FUNDING;
-import static org.dspace.app.orcid.model.OrcidEntityType.PUBLICATION;
+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;
 

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;
 

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;

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;

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;

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;

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;

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;