diff --git a/dhp-broker-application/.factorypath b/apps/dhp-broker-application/.factorypath
similarity index 100%
rename from dhp-broker-application/.factorypath
rename to apps/dhp-broker-application/.factorypath
diff --git a/dhp-broker-application/deploy.info b/apps/dhp-broker-application/deploy.info
similarity index 100%
rename from dhp-broker-application/deploy.info
rename to apps/dhp-broker-application/deploy.info
diff --git a/dhp-broker-application/mvnw b/apps/dhp-broker-application/mvnw
similarity index 100%
rename from dhp-broker-application/mvnw
rename to apps/dhp-broker-application/mvnw
diff --git a/dhp-broker-application/mvnw.cmd b/apps/dhp-broker-application/mvnw.cmd
similarity index 100%
rename from dhp-broker-application/mvnw.cmd
rename to apps/dhp-broker-application/mvnw.cmd
diff --git a/dhp-broker-application/pom.xml b/apps/dhp-broker-application/pom.xml
similarity index 98%
rename from dhp-broker-application/pom.xml
rename to apps/dhp-broker-application/pom.xml
index 1bb5aed4..d16cf351 100644
--- a/dhp-broker-application/pom.xml
+++ b/apps/dhp-broker-application/pom.xml
@@ -5,7 +5,7 @@
 
 	<parent>
 		<groupId>eu.dnetlib</groupId>
-		<artifactId>dnet-applications</artifactId>
+		<artifactId>apps</artifactId>
 		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplication.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplication.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplication.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplication.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceConfiguration.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceConfiguration.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceConfiguration.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceConfiguration.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AbstractLbsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AbstractLbsController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AbstractLbsController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AbstractLbsController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AjaxController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AjaxController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AjaxController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AjaxController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/EventsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/EventsController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/EventsController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/EventsController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/NotificationsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/NotificationsController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/NotificationsController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/NotificationsController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/SubscriptionsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/SubscriptionsController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/SubscriptionsController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/SubscriptionsController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/TopicsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/TopicsController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/TopicsController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/TopicsController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/BufferStatus.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/BufferStatus.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/BufferStatus.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/BufferStatus.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/CurrentStatus.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/CurrentStatus.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/CurrentStatus.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/CurrentStatus.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/DispatcherStatus.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/DispatcherStatus.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/DispatcherStatus.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/DispatcherStatus.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/ThreadStatus.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/ThreadStatus.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/ThreadStatus.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/ThreadStatus.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/Tool.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/Tool.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/Tool.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/Tool.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/cron/ScheduledActions.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/cron/ScheduledActions.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/cron/ScheduledActions.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/cron/ScheduledActions.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/EventRepository.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/EventRepository.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/EventRepository.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/EventRepository.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/EventStatsManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/EventStatsManager.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/EventStatsManager.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/EventStatsManager.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/NotificationRepository.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/NotificationRepository.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/NotificationRepository.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/NotificationRepository.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/EventMessage.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/EventMessage.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/EventMessage.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/EventMessage.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/MapValue.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/MapValue.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/MapValue.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/MapValue.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/MapValueType.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/MapValueType.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/MapValueType.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/input/MapValueType.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManager.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManager.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManager.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManagerFactory.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManagerFactory.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManagerFactory.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManagerFactory.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/AbstractNotificationDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/AbstractNotificationDispatcher.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/AbstractNotificationDispatcher.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/AbstractNotificationDispatcher.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/DispatcherManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/DispatcherManager.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/DispatcherManager.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/DispatcherManager.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/EmailDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/EmailDispatcher.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/EmailDispatcher.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/EmailDispatcher.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/MockDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/MockDispatcher.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/MockDispatcher.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/MockDispatcher.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/NotificationDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/NotificationDispatcher.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/NotificationDispatcher.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/NotificationDispatcher.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/MetricInterceptor.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/MetricInterceptor.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/MetricInterceptor.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/MetricInterceptor.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestCounterInterceptor.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestCounterInterceptor.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestCounterInterceptor.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestCounterInterceptor.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestTimingInterceptor.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestTimingInterceptor.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestTimingInterceptor.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestTimingInterceptor.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/WebMvcConfig.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/WebMvcConfig.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/WebMvcConfig.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/WebMvcConfig.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/AdvQueryObject.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/AdvQueryObject.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/AdvQueryObject.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/AdvQueryObject.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/BrowseEntry.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/BrowseEntry.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/BrowseEntry.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/BrowseEntry.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ElasticSearchQueryUtils.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ElasticSearchQueryUtils.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ElasticSearchQueryUtils.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ElasticSearchQueryUtils.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/EventsPage.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/EventsPage.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/EventsPage.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/EventsPage.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/HomeController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/HomeController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/HomeController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/HomeController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireSubscription.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireSubscription.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireSubscription.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireSubscription.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/Range.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/Range.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/Range.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/Range.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ScrollPage.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ScrollPage.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ScrollPage.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ScrollPage.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/SimpleSubscriptionDesc.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/SimpleSubscriptionDesc.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/SimpleSubscriptionDesc.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/SimpleSubscriptionDesc.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/DatabaseProperties.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/DatabaseProperties.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/DatabaseProperties.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/DatabaseProperties.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/ElasticSearchProperties.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/ElasticSearchProperties.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/ElasticSearchProperties.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/ElasticSearchProperties.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/EmailProperties.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/EmailProperties.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/EmailProperties.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/EmailProperties.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionOperator.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionOperator.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionOperator.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionOperator.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionParams.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionParams.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionParams.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionParams.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/MapCondition.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/MapCondition.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/MapCondition.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/MapCondition.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationFrequency.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationFrequency.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationFrequency.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationFrequency.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationMode.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationMode.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationMode.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationMode.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/Subscription.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/Subscription.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/Subscription.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/Subscription.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/SubscriptionRepository.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/SubscriptionRepository.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/SubscriptionRepository.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/subscriptions/SubscriptionRepository.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/topics/TopicType.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/topics/TopicType.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/topics/TopicType.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/topics/TopicType.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/topics/TopicTypeRepository.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/topics/TopicTypeRepository.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/topics/TopicTypeRepository.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/topics/TopicTypeRepository.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/DateParser.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/DateParser.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/DateParser.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/DateParser.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/EventVerifier.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/EventVerifier.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/EventVerifier.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/EventVerifier.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/JsonMessageToEventFunction.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/JsonMessageToEventFunction.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/JsonMessageToEventFunction.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/JsonMessageToEventFunction.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/LbsQueue.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/LbsQueue.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/LbsQueue.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/LbsQueue.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/QueueManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/QueueManager.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/QueueManager.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/QueueManager.java
diff --git a/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/ThreadManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/ThreadManager.java
similarity index 100%
rename from dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/ThreadManager.java
rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/ThreadManager.java
diff --git a/dhp-broker-application/src/main/java/org/springframework/data/elasticsearch/core/ElasticSearchScrollUtils.java b/apps/dhp-broker-application/src/main/java/org/springframework/data/elasticsearch/core/ElasticSearchScrollUtils.java
similarity index 100%
rename from dhp-broker-application/src/main/java/org/springframework/data/elasticsearch/core/ElasticSearchScrollUtils.java
rename to apps/dhp-broker-application/src/main/java/org/springframework/data/elasticsearch/core/ElasticSearchScrollUtils.java
diff --git a/dhp-broker-application/src/main/resources/application.properties b/apps/dhp-broker-application/src/main/resources/application.properties
similarity index 100%
rename from dhp-broker-application/src/main/resources/application.properties
rename to apps/dhp-broker-application/src/main/resources/application.properties
diff --git a/dhp-broker-application/src/main/resources/config/mapping_es7.sh b/apps/dhp-broker-application/src/main/resources/config/mapping_es7.sh
similarity index 100%
rename from dhp-broker-application/src/main/resources/config/mapping_es7.sh
rename to apps/dhp-broker-application/src/main/resources/config/mapping_es7.sh
diff --git a/dhp-broker-application/src/main/resources/static/css/angular-backtop.css b/apps/dhp-broker-application/src/main/resources/static/css/angular-backtop.css
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/css/angular-backtop.css
rename to apps/dhp-broker-application/src/main/resources/static/css/angular-backtop.css
diff --git a/dhp-broker-application/src/main/resources/static/css/bootstrap-theme.min.css b/apps/dhp-broker-application/src/main/resources/static/css/bootstrap-theme.min.css
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/css/bootstrap-theme.min.css
rename to apps/dhp-broker-application/src/main/resources/static/css/bootstrap-theme.min.css
diff --git a/dhp-broker-application/src/main/resources/static/css/bootstrap.min.css b/apps/dhp-broker-application/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/css/bootstrap.min.css
rename to apps/dhp-broker-application/src/main/resources/static/css/bootstrap.min.css
diff --git a/dhp-broker-application/src/main/resources/static/css/rzslider.min.css b/apps/dhp-broker-application/src/main/resources/static/css/rzslider.min.css
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/css/rzslider.min.css
rename to apps/dhp-broker-application/src/main/resources/static/css/rzslider.min.css
diff --git a/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.eot b/apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.eot
rename to apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.eot
diff --git a/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.svg b/apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.svg
rename to apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.svg
diff --git a/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf b/apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf
rename to apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf
diff --git a/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.woff b/apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.woff
rename to apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.woff
diff --git a/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.woff2 b/apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.woff2
rename to apps/dhp-broker-application/src/main/resources/static/fonts/glyphicons-halflings-regular.woff2
diff --git a/dhp-broker-application/src/main/resources/static/html/adminOperation.template.html b/apps/dhp-broker-application/src/main/resources/static/html/adminOperation.template.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/html/adminOperation.template.html
rename to apps/dhp-broker-application/src/main/resources/static/html/adminOperation.template.html
diff --git a/dhp-broker-application/src/main/resources/static/html/eventsByTopic.html b/apps/dhp-broker-application/src/main/resources/static/html/eventsByTopic.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/html/eventsByTopic.html
rename to apps/dhp-broker-application/src/main/resources/static/html/eventsByTopic.html
diff --git a/dhp-broker-application/src/main/resources/static/html/filterEvents.html b/apps/dhp-broker-application/src/main/resources/static/html/filterEvents.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/html/filterEvents.html
rename to apps/dhp-broker-application/src/main/resources/static/html/filterEvents.html
diff --git a/dhp-broker-application/src/main/resources/static/html/subscriptions.html b/apps/dhp-broker-application/src/main/resources/static/html/subscriptions.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/html/subscriptions.html
rename to apps/dhp-broker-application/src/main/resources/static/html/subscriptions.html
diff --git a/dhp-broker-application/src/main/resources/static/html/summary.html b/apps/dhp-broker-application/src/main/resources/static/html/summary.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/html/summary.html
rename to apps/dhp-broker-application/src/main/resources/static/html/summary.html
diff --git a/dhp-broker-application/src/main/resources/static/html/topics.html b/apps/dhp-broker-application/src/main/resources/static/html/topics.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/html/topics.html
rename to apps/dhp-broker-application/src/main/resources/static/html/topics.html
diff --git a/dhp-broker-application/src/main/resources/static/html/twoStepButton.template.html b/apps/dhp-broker-application/src/main/resources/static/html/twoStepButton.template.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/html/twoStepButton.template.html
rename to apps/dhp-broker-application/src/main/resources/static/html/twoStepButton.template.html
diff --git a/dhp-broker-application/src/main/resources/static/index.html b/apps/dhp-broker-application/src/main/resources/static/index.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/index.html
rename to apps/dhp-broker-application/src/main/resources/static/index.html
diff --git a/dhp-broker-application/src/main/resources/static/js/angular-backtop.min.js b/apps/dhp-broker-application/src/main/resources/static/js/angular-backtop.min.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/angular-backtop.min.js
rename to apps/dhp-broker-application/src/main/resources/static/js/angular-backtop.min.js
diff --git a/dhp-broker-application/src/main/resources/static/js/angular-base64.min.js b/apps/dhp-broker-application/src/main/resources/static/js/angular-base64.min.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/angular-base64.min.js
rename to apps/dhp-broker-application/src/main/resources/static/js/angular-base64.min.js
diff --git a/dhp-broker-application/src/main/resources/static/js/angular-local-storage.min.js b/apps/dhp-broker-application/src/main/resources/static/js/angular-local-storage.min.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/angular-local-storage.min.js
rename to apps/dhp-broker-application/src/main/resources/static/js/angular-local-storage.min.js
diff --git a/dhp-broker-application/src/main/resources/static/js/angular-route.min.js b/apps/dhp-broker-application/src/main/resources/static/js/angular-route.min.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/angular-route.min.js
rename to apps/dhp-broker-application/src/main/resources/static/js/angular-route.min.js
diff --git a/dhp-broker-application/src/main/resources/static/js/angular.min.js b/apps/dhp-broker-application/src/main/resources/static/js/angular.min.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/angular.min.js
rename to apps/dhp-broker-application/src/main/resources/static/js/angular.min.js
diff --git a/dhp-broker-application/src/main/resources/static/js/bootstrap.min.js b/apps/dhp-broker-application/src/main/resources/static/js/bootstrap.min.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/bootstrap.min.js
rename to apps/dhp-broker-application/src/main/resources/static/js/bootstrap.min.js
diff --git a/dhp-broker-application/src/main/resources/static/js/jquery-1.12.3.min.js b/apps/dhp-broker-application/src/main/resources/static/js/jquery-1.12.3.min.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/jquery-1.12.3.min.js
rename to apps/dhp-broker-application/src/main/resources/static/js/jquery-1.12.3.min.js
diff --git a/dhp-broker-application/src/main/resources/static/js/jquery-1.12.3.min.map b/apps/dhp-broker-application/src/main/resources/static/js/jquery-1.12.3.min.map
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/jquery-1.12.3.min.map
rename to apps/dhp-broker-application/src/main/resources/static/js/jquery-1.12.3.min.map
diff --git a/dhp-broker-application/src/main/resources/static/js/lbs-ui.js b/apps/dhp-broker-application/src/main/resources/static/js/lbs-ui.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/lbs-ui.js
rename to apps/dhp-broker-application/src/main/resources/static/js/lbs-ui.js
diff --git a/dhp-broker-application/src/main/resources/static/js/rzslider.min.js b/apps/dhp-broker-application/src/main/resources/static/js/rzslider.min.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/js/rzslider.min.js
rename to apps/dhp-broker-application/src/main/resources/static/js/rzslider.min.js
diff --git a/dhp-broker-application/src/main/resources/static/openaire/datasources.html b/apps/dhp-broker-application/src/main/resources/static/openaire/datasources.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/openaire/datasources.html
rename to apps/dhp-broker-application/src/main/resources/static/openaire/datasources.html
diff --git a/dhp-broker-application/src/main/resources/static/openaire/index.html b/apps/dhp-broker-application/src/main/resources/static/openaire/index.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/openaire/index.html
rename to apps/dhp-broker-application/src/main/resources/static/openaire/index.html
diff --git a/dhp-broker-application/src/main/resources/static/openaire/login.html b/apps/dhp-broker-application/src/main/resources/static/openaire/login.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/openaire/login.html
rename to apps/dhp-broker-application/src/main/resources/static/openaire/login.html
diff --git a/dhp-broker-application/src/main/resources/static/openaire/notifications.html b/apps/dhp-broker-application/src/main/resources/static/openaire/notifications.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/openaire/notifications.html
rename to apps/dhp-broker-application/src/main/resources/static/openaire/notifications.html
diff --git a/dhp-broker-application/src/main/resources/static/openaire/openaire-lbs-ui.js b/apps/dhp-broker-application/src/main/resources/static/openaire/openaire-lbs-ui.js
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/openaire/openaire-lbs-ui.js
rename to apps/dhp-broker-application/src/main/resources/static/openaire/openaire-lbs-ui.js
diff --git a/dhp-broker-application/src/main/resources/static/openaire/query.html b/apps/dhp-broker-application/src/main/resources/static/openaire/query.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/openaire/query.html
rename to apps/dhp-broker-application/src/main/resources/static/openaire/query.html
diff --git a/dhp-broker-application/src/main/resources/static/openaire/subscriptions.html b/apps/dhp-broker-application/src/main/resources/static/openaire/subscriptions.html
similarity index 100%
rename from dhp-broker-application/src/main/resources/static/openaire/subscriptions.html
rename to apps/dhp-broker-application/src/main/resources/static/openaire/subscriptions.html
diff --git a/dhp-broker-application/src/main/resources/templates/mail.st b/apps/dhp-broker-application/src/main/resources/templates/mail.st
similarity index 100%
rename from dhp-broker-application/src/main/resources/templates/mail.st
rename to apps/dhp-broker-application/src/main/resources/templates/mail.st
diff --git a/dhp-broker-application/src/test/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplicationTests.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplicationTests.java
similarity index 100%
rename from dhp-broker-application/src/test/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplicationTests.java
rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplicationTests.java
diff --git a/dhp-broker-application/src/test/java/eu/dnetlib/lbs/clients/IndexClientTest.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/clients/IndexClientTest.java
similarity index 100%
rename from dhp-broker-application/src/test/java/eu/dnetlib/lbs/clients/IndexClientTest.java
rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/clients/IndexClientTest.java
diff --git a/dhp-broker-application/src/test/java/eu/dnetlib/lbs/events/input/MapValueTest.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/events/input/MapValueTest.java
similarity index 100%
rename from dhp-broker-application/src/test/java/eu/dnetlib/lbs/events/input/MapValueTest.java
rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/events/input/MapValueTest.java
diff --git a/dhp-broker-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java
similarity index 100%
rename from dhp-broker-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java
rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java
diff --git a/dhp-broker-application/src/test/java/eu/dnetlib/lbs/subscriptions/ConditionTest.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/subscriptions/ConditionTest.java
similarity index 100%
rename from dhp-broker-application/src/test/java/eu/dnetlib/lbs/subscriptions/ConditionTest.java
rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/subscriptions/ConditionTest.java
diff --git a/dhp-broker-application/src/test/java/eu/dnetlib/lbs/tests/OpenaireQueriesTest.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/tests/OpenaireQueriesTest.java
similarity index 100%
rename from dhp-broker-application/src/test/java/eu/dnetlib/lbs/tests/OpenaireQueriesTest.java
rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/tests/OpenaireQueriesTest.java
diff --git a/dhp-broker-application/src/test/java/eu/dnetlib/lbs/utils/JsonMessageToEventFunctionTest.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/utils/JsonMessageToEventFunctionTest.java
similarity index 100%
rename from dhp-broker-application/src/test/java/eu/dnetlib/lbs/utils/JsonMessageToEventFunctionTest.java
rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/utils/JsonMessageToEventFunctionTest.java
diff --git a/dhp-broker-application/src/test/resources/applicationContext-test-queries.xml b/apps/dhp-broker-application/src/test/resources/applicationContext-test-queries.xml
similarity index 100%
rename from dhp-broker-application/src/test/resources/applicationContext-test-queries.xml
rename to apps/dhp-broker-application/src/test/resources/applicationContext-test-queries.xml
diff --git a/dhp-broker-application/src/test/resources/logback-test.xml b/apps/dhp-broker-application/src/test/resources/logback-test.xml
similarity index 100%
rename from dhp-broker-application/src/test/resources/logback-test.xml
rename to apps/dhp-broker-application/src/test/resources/logback-test.xml
diff --git a/dhp-broker-application/src/test/resources/scripts/perl/eventImporter.pl b/apps/dhp-broker-application/src/test/resources/scripts/perl/eventImporter.pl
similarity index 100%
rename from dhp-broker-application/src/test/resources/scripts/perl/eventImporter.pl
rename to apps/dhp-broker-application/src/test/resources/scripts/perl/eventImporter.pl
diff --git a/dhp-broker-application/src/test/resources/scripts/perl/mockImporter.pl b/apps/dhp-broker-application/src/test/resources/scripts/perl/mockImporter.pl
similarity index 100%
rename from dhp-broker-application/src/test/resources/scripts/perl/mockImporter.pl
rename to apps/dhp-broker-application/src/test/resources/scripts/perl/mockImporter.pl
diff --git a/dhp-broker-application/src/test/resources/scripts/perl/test.pl b/apps/dhp-broker-application/src/test/resources/scripts/perl/test.pl
similarity index 100%
rename from dhp-broker-application/src/test/resources/scripts/perl/test.pl
rename to apps/dhp-broker-application/src/test/resources/scripts/perl/test.pl
diff --git a/dhp-broker-application/src/test/resources/test-event-1.json b/apps/dhp-broker-application/src/test/resources/test-event-1.json
similarity index 100%
rename from dhp-broker-application/src/test/resources/test-event-1.json
rename to apps/dhp-broker-application/src/test/resources/test-event-1.json
diff --git a/dhp-broker-application/src/test/resources/test-search-on-map.json b/apps/dhp-broker-application/src/test/resources/test-search-on-map.json
similarity index 100%
rename from dhp-broker-application/src/test/resources/test-search-on-map.json
rename to apps/dhp-broker-application/src/test/resources/test-search-on-map.json
diff --git a/apps/pom.xml b/apps/pom.xml
new file mode 100644
index 00000000..469c85de
--- /dev/null
+++ b/apps/pom.xml
@@ -0,0 +1,138 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<parent>
+		<groupId>eu.dnetlib</groupId>
+		<artifactId>dnet-applications</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>eu.dnetlib</groupId>
+	<artifactId>apps</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>dhp-broker-application</module>
+	</modules>
+
+	<issueManagement>
+		<system>Redmine</system>
+		<url>https://issue.openaire.research-infrastructures.eu/projects/openaire</url>
+	</issueManagement>
+
+	<ciManagement>
+		<system>jenkins</system>
+		<url>https://jenkins-dnet.d4science.org/</url>
+	</ciManagement>
+
+	<scm>
+		<connection>scm:git:gitea@code-repo.d4science.org:D-Net/dnet-applications.git</connection>
+		<developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dnet-applications.git</developerConnection>
+		<url>https://code-repo.d4science.org/D-Net/dnet-applications/</url>
+		<tag>HEAD</tag>
+	</scm>
+
+	<description>This module is the root descriptor for the dnet-applications project</description>
+
+	<pluginRepositories>
+	</pluginRepositories>
+
+	<repositories>
+		<repository>
+			<id>dnet45-releases</id>
+			<name>D-Net 45 releases</name>
+			<url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases</url>
+			<layout>default</layout>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<!-- Spring Boot -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-lang3</artifactId>
+			</dependency>
+
+			<dependency>
+				<groupId>commons-codec</groupId>
+				<artifactId>commons-codec</artifactId>
+				<version>1.9</version>
+			</dependency>
+
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>2.4</version>
+			</dependency>
+
+			<dependency>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>1.2</version>
+				<scope>provided</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>dom4j</groupId>
+				<artifactId>dom4j</artifactId>
+				<version>1.6.1</version>
+			</dependency>
+
+			<dependency>
+				<groupId>xml-apis</groupId>
+				<artifactId>xml-apis</artifactId>
+				<version>1.4.01</version>
+			</dependency>
+
+			<dependency>
+				<groupId>jaxen</groupId>
+				<artifactId>jaxen</artifactId>
+				<version>1.1.6</version>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<configuration>
+						<executable>true</executable>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+</project>
diff --git a/libs/pom.xml b/libs/pom.xml
new file mode 100644
index 00000000..95f15c29
--- /dev/null
+++ b/libs/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<parent>
+		<groupId>eu.dnetlib</groupId>
+		<artifactId>dnet-applications</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>eu.dnetlib</groupId>
+	<artifactId>libs</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bdb76e23..bcbbb906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,13 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.3.1.RELEASE</version>
+		<relativePath></relativePath>
+	</parent>
+
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.dnetlib</groupId>
 	<artifactId>dnet-applications</artifactId>
@@ -19,15 +26,9 @@
 		</license>
 	</licenses>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
-		<relativePath></relativePath>
-	</parent>
-
 	<modules>
-		<module>dhp-broker-application</module>
+		<module>apps</module>
+		<module>libs</module>
 	</modules>
 
 	<issueManagement>
@@ -68,19 +69,7 @@
 	</repositories>
 
 	<dependencies>
-		<!-- Spring Boot -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-		</dependency>
-
-
-
+		
 		<!-- Commons -->
 		<dependency>
 			<groupId>javax.validation</groupId>
@@ -120,12 +109,8 @@
 			<artifactId>mockito-junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
+
 		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 
 	</dependencies>
 
@@ -184,14 +169,6 @@
 		<testOutputDirectory>target/test-classes</testOutputDirectory>
 		<pluginManagement>
 			<plugins>
-				<plugin>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-maven-plugin</artifactId>
-					<configuration>
-						<executable>true</executable>
-					</configuration>
-				</plugin>
-
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>