diff --git a/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManager.java b/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManager.java
new file mode 100644
index 0000000..01ca7ae
--- /dev/null
+++ b/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManager.java
@@ -0,0 +1,4 @@
+package eu.dnetlib.data.datasource;
+
+public interface LocalSimpleDatasourceManager {
+}
diff --git a/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManagerImpl.java b/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManagerImpl.java
new file mode 100644
index 0000000..44b07ea
--- /dev/null
+++ b/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManagerImpl.java
@@ -0,0 +1,125 @@
+package eu.dnetlib.data.datasource;
+
+import eu.dnetlib.enabling.datasources.common.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class LocalDatasourceManagerImpl implements LocalSimpleDatasourceManager {
+    @Override
+    public Set<String> listManagedDatasourceIds() throws DsmRuntimeException {
+        return null;
+    }
+
+    @Override
+    public List<SimpleDatasource> searchDatasourcesByType(String type) throws DsmException {
+        return null;
+    }
+
+    @Override
+    public List<? extends SearchApisEntry> searchApis(String field, Object value) throws DsmException {
+        return null;
+    }
+
+    @Override
+    public List<? extends BrowsableField> listBrowsableFields() throws DsmException {
+        return null;
+    }
+
+    @Override
+    public List<? extends BrowseTerm> browseField(String field) throws DsmException {
+        return null;
+    }
+
+    @Override
+    public void setActive(String dsId, String apiId, boolean active) throws DsmException {
+
+    }
+
+    @Override
+    public boolean isActive(String dsId, String apiId) throws DsmException {
+        return false;
+    }
+
+    @Override
+    public void setLastCollectionInfo(String dsId, String apiId, String mdId, Integer size, Date date) throws DsmException {
+
+    }
+
+    @Override
+    public void setLastAggregationInfo(String dsId, String apiId, String mdId, Integer size, Date date) throws DsmException {
+
+    }
+
+    @Override
+    public void setLastDownloadInfo(String dsId, String apiId, String objId, Integer size, Date date) throws DsmException {
+
+    }
+
+    @Override
+    public void setLastValidationJob(String dsId, String apiId, String jobId) throws DsmException {
+
+    }
+
+    @Override
+    public void updateApiDetails(String dsId, String apiId, String metadataIdentifierPath, String baseUrl, Map<String, String> params) throws DsmException {
+
+    }
+
+    @Override
+    public boolean isRemovable(String dsId, String apiId) throws DsmException {
+        return false;
+    }
+
+    @Override
+    public void regenerateProfiles() throws DsmException {
+
+    }
+
+    @Override
+    public Datasource<Organization<?>, Identity> getDs(String id) throws DsmException {
+        return null;
+    }
+
+    @Override
+    public List<? extends Api<ApiParam>> getApis(String dsId) throws DsmException {
+        return null;
+    }
+
+    @Override
+    public void deleteDs(String dsId) throws DsmException {
+
+    }
+
+    @Override
+    public void deleteApi(String dsId, String apiId) throws DsmException {
+
+    }
+
+    @Override
+    public void addApi(Api<ApiParam> api) throws DsmException {
+
+    }
+
+    @Override
+    public void setManaged(String id, boolean managed) throws DsmException {
+
+    }
+
+    @Override
+    public boolean isManaged(String id) throws DsmException {
+        return false;
+    }
+
+    @Override
+    public void saveDs(Datasource<Organization<?>, Identity> datasource) throws DsmException {
+
+    }
+
+    @Override
+    public void updateCompliance(String dsId, String apiId, String compliance, boolean override) throws DsmException {
+
+    }
+}
diff --git a/dnet-data-services/src/main/resources/eu/dnetlib/datasource/applicationContext-dnet-datasource-manager.xml b/dnet-data-services/src/main/resources/eu/dnetlib/datasource/applicationContext-dnet-datasource-manager.xml
new file mode 100644
index 0000000..e8b2ade
--- /dev/null
+++ b/dnet-data-services/src/main/resources/eu/dnetlib/datasource/applicationContext-dnet-datasource-manager.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:t="http://dnetlib.eu/springbeans/t"
+       xmlns:template="http://dnetlib.eu/springbeans/template"
+       xmlns="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+
+
+                                    http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+                            http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+
+                            http://dnetlib.eu/springbeans/template http://dnetlib.eu/springbeans/template.xsd">
+
+
+    <bean id="objectStoreService"
+          class="eu.dnetlib.data.objectstore.modular.ModularObjectStoreService"
+          init-method="start" destroy-method="stop"
+          p:feeder-ref="objectstoreFeeder"
+          p:objectStoreDeliver-ref="objectstoreDeliver"
+          p:notificationHandler-ref="objectstoreNotificationHandler"
+            />
+
+    <bean id="objectstoreFeeder"
+          class="eu.dnetlib.data.objectstore.modular.ModularObjectStoreFeeder"
+          p:dao-ref="${services.objectstore.dao}"
+          p:resultSetClientFactory-ref="objectstoreResultSetClientFactory"
+          p:serviceLocator-ref="uniqueServiceLocator"
+            />
+
+    <bean id="objectstoreDeliver"
+          class="eu.dnetlib.data.objectstore.modular.ModularObjectStoreDeliver"
+          p:dao-ref="${services.objectstore.dao}"
+          p:resultSetClientFactory-ref="objectstoreResultSetClientFactory"
+
+            />
+
+
+    <bean id="objectstoreResultSetClientFactory" parent="resultSetClientFactory"
+          p:pageSize="${services.objectstore.rsfactory.pagesize}"/>
+
+
+    <bean id="objectstoreProfileCreator" class="eu.dnetlib.data.objectstore.modular.ObjectStoreProfileCreator"
+          p:serviceLocator-ref="uniqueServiceLocator" p:objectstoreDsTemplate-ref="objectstoreDsTemplate"
+          p:endpoint-ref="objectStoreServiceEndpoint" p:eprBuilder-ref="jaxwsEndpointReferenceBuilder"/>
+
+    <bean id="objectstoreNotificationHandler"
+          class="eu.dnetlib.enabling.tools.blackboard.BlackboardServerExecutorNotificationHandler"
+          p:blackboardExecutor-ref="objectstoreBlackboardExecutor"/>
+
+    <bean id="objectstoreBlackboardExecutor"
+          class="eu.dnetlib.enabling.tools.blackboard.BlackboardServerActionExecutor"
+          p:blackboardHandler-ref="blackboardHandler"
+          p:actionType="eu.dnetlib.data.objectstore.modular.ObjectStoreActions"
+          p:incomplete="false">
+        <property name="actionMap">
+            <map>
+                <entry key="CREATE">
+                    <bean class="eu.dnetlib.data.objectstore.modular.CreateObjectStoreAction"
+                          p:profileCreator-ref="objectstoreProfileCreator" p:dao-ref="${services.objectstore.dao}"/>
+                </entry>
+                <entry key="DELETE">
+                    <bean class="eu.dnetlib.data.objectstore.modular.DeleteObjectStoreAction"
+                          p:profileCreator-ref="objectstoreProfileCreator" p:dao-ref="${services.objectstore.dao}"/>
+                </entry>
+                <entry key="DROP_CONTENT">
+                    <bean class="eu.dnetlib.data.objectstore.modular.DropContentObjectStoreAction"
+                          p:dao-ref="${services.objectstore.dao}"/>
+                </entry>
+
+                <entry key="FEED">
+                    <bean class="eu.dnetlib.data.objectstore.modular.FeedObjectStoreAction"
+                          p:profileCreator-ref="objectstoreProfileCreator"
+                          p:storeFeeder-ref="objectstoreFeeder"
+                          p:dao-ref="${services.objectstore.dao}"/>
+                </entry>
+
+                <entry key="FEEDOBJECT">
+                    <bean class="eu.dnetlib.data.objectstore.modular.FeedCompleteObjectAction"
+                          p:storeFeeder-ref="objectstoreFeeder"
+                          p:dao-ref="${services.objectstore.dao}"/>
+                </entry>
+            </map>
+        </property>
+    </bean>
+
+
+    <bean id="objectStoreLocator" class="eu.dnetlib.enabling.tools.StaticServiceLocator"
+          p:service-ref="objectStoreService"/>
+
+
+    <bean id="objectstoreDsTemplate"
+          class="eu.dnetlib.springutils.stringtemplate.StringTemplateFactory"
+          p:template="classpath:/eu/dnetlib/data/objectstore/objectstoreds-template.xml"
+          scope="prototype"/>
+
+
+    <!-- endpoints -->
+    <jaxws:endpoint id="objectStoreServiceEndpoint"
+                    implementor="#objectStoreService" implementorClass="eu.dnetlib.data.objectstore.rmi.ObjectStoreService"
+                    address="/objectStore"/>
+
+    <template:instance name="serviceRegistrationManager"
+                       t:serviceRegistrationManagerClass="eu.dnetlib.enabling.tools.registration.ValidatingServiceRegistrationManagerImpl"
+                       t:name="objectStoreServiceRegistrationManager" t:service="objectStoreService"
+                       t:endpoint="objectStoreServiceEndpoint" t:jobScheduler="jobScheduler"
+                       t:serviceRegistrator="blackboardServiceRegistrator"/>
+
+
+</beans>
diff --git a/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/common/master.st b/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/common/master.st
similarity index 100%
rename from dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/common/master.st
rename to dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/common/master.st
diff --git a/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/dnetLog.st b/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/dnetLog.st
similarity index 100%
rename from dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/dnetLog.st
rename to dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/dnetLog.st
diff --git a/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/index.st b/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/index.st
similarity index 100%
rename from dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/index.st
rename to dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/index.st
diff --git a/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/info.st b/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/info.st
similarity index 100%
rename from dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/info.st
rename to dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/info.st
diff --git a/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/prepareShutdown.st b/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/prepareShutdown.st
similarity index 100%
rename from dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/prepareShutdown.st
rename to dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/prepareShutdown.st
diff --git a/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/properties.st b/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/properties.st
similarity index 100%
rename from dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/properties.st
rename to dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/properties.st
diff --git a/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/userDetails.st b/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/userDetails.st
similarity index 100%
rename from dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/userDetails.st
rename to dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/userDetails.st
diff --git a/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/users.st b/dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/users.st
similarity index 100%
rename from dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/views/ui/users.st
rename to dnet-modular-ui/src/main/resources/eu/dnetlib/functionality/modular/ui/views/ui/users.st