diff --git a/datastore_server/resource/dependency-structure.ddf b/datastore_server/resource/dependency-structure.ddf
index ef9bc3b9d420ec92bfe3d06d2b6918c2d3da6718..be9217071a8bcb93e7a7416ac797a4f75155f52c 100644
--- a/datastore_server/resource/dependency-structure.ddf
+++ b/datastore_server/resource/dependency-structure.ddf
@@ -34,7 +34,7 @@ check layeringOf l1 l2
 
 ######################################################################
 # Check dependencies between the api client and the rest of dss
-[dss.api.client] = ${dss}.api.v1.client.* ${dss}.api.v1.shared.* ${dss}.rpc.client.*
+[dss.api.client] = ${dss}.client.api.* ${dss}.generic.shared.api.*
 [dss.internal] = ${dss}.* excluding [dss.api.client]
 
 check [dss.api.client] independentOf [dss.internal]
diff --git a/datastore_server/source/java/dssApplicationContext.xml b/datastore_server/source/java/dssApplicationContext.xml
index 98701462dd04ab2469cad38c9e74c3ebccdbca79..966b306525a08ed0b7e3dc2f6e53146df824bc75 100644
--- a/datastore_server/source/java/dssApplicationContext.xml
+++ b/datastore_server/source/java/dssApplicationContext.xml
@@ -60,11 +60,11 @@
      <bean id="data-store-rpc-service-generic"
         class="com.marathon.util.spring.StreamSupportingHttpInvokerServiceExporter">
         <property name="service">
-            <bean class="ch.systemsx.cisd.openbis.dss.api.v1.server.DssServiceRpcGeneric">
+            <bean class="ch.systemsx.cisd.openbis.dss.generic.server.api.v1.DssServiceRpcGeneric">
                 <constructor-arg ref="openBIS-service" />
             </bean>
         </property>
-        <property name="serviceInterface" value="ch.systemsx.cisd.openbis.dss.api.v1.shared.IDssServiceRpcGeneric" />
+        <property name="serviceInterface" value="ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.IDssServiceRpcGeneric" />
     </bean>
     
     <bean id="rpc-name-server" class="ch.systemsx.cisd.common.api.server.RpcServiceNameServer" />