Restruct resource-manipulation folders

change 'basis' to 'resource-manipulation'
add sub-folder 'modules' for resource common funcions

Change-Id: Iec5b700d2f68cb63807da4ee2e050cbb8c8dbcdb
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/SConscript b/service/SConscript
index a3bd70e..02142f6 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -40,6 +40,9 @@ if target_os not in ['arduino','darwin','ios']:
 
        # Build notification manager project
        SConscript('notification-manager/SConscript')
 
        # Build notification manager project
        SConscript('notification-manager/SConscript')

+
+        # Build resource-manipulation project
+        #SCconscript('resource-manipulation/SConscript')

 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')
 
 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')
 

diff --git a/service/basis/README b/service/resource-manipulation/README
similarity index 100%
rename from service/basis/README
rename to service/resource-manipulation/README

diff --git a/service/basis/SConscript b/service/resource-manipulation/SConscript
similarity index 100%
rename from service/basis/SConscript
rename to service/resource-manipulation/SConscript

diff --git a/service/basis/common/SConscript b/service/resource-manipulation/modules/common/SConscript
similarity index 100%
rename from service/basis/common/SConscript
rename to service/resource-manipulation/modules/common/SConscript

diff --git a/service/basis/common/primitiveResource/SConscript b/service/resource-manipulation/modules/common/primitiveResource/SConscript
similarity index 100%
rename from service/basis/common/primitiveResource/SConscript
rename to service/resource-manipulation/modules/common/primitiveResource/SConscript

diff --git a/service/basis/common/primitiveResource/include/PresenceSubscriber.h b/service/resource-manipulation/modules/common/primitiveResource/include/PresenceSubscriber.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/PresenceSubscriber.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/PresenceSubscriber.h

diff --git a/service/basis/common/primitiveResource/include/PrimitiveException.h b/service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveException.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/PrimitiveException.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveException.h

diff --git a/service/basis/common/primitiveResource/include/PrimitiveResource.h b/service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveResource.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/PrimitiveResource.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveResource.h

diff --git a/service/basis/common/primitiveResource/include/ResourceAttributes.h b/service/resource-manipulation/modules/common/primitiveResource/include/ResourceAttributes.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/ResourceAttributes.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/ResourceAttributes.h

diff --git a/service/basis/common/primitiveResource/include/ResponseStatement.h b/service/resource-manipulation/modules/common/primitiveResource/include/ResponseStatement.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/ResponseStatement.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/ResponseStatement.h

diff --git a/service/basis/common/primitiveResource/include/internal/AssertUtils.h b/service/resource-manipulation/modules/common/primitiveResource/include/internal/AssertUtils.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/internal/AssertUtils.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/internal/AssertUtils.h

diff --git a/service/basis/common/primitiveResource/include/internal/PrimitiveResourceImpl.h b/service/resource-manipulation/modules/common/primitiveResource/include/internal/PrimitiveResourceImpl.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/internal/PrimitiveResourceImpl.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/internal/PrimitiveResourceImpl.h

diff --git a/service/basis/common/primitiveResource/include/internal/ResourceAtrributesConverter.h b/service/resource-manipulation/modules/common/primitiveResource/include/internal/ResourceAtrributesConverter.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/internal/ResourceAtrributesConverter.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/internal/ResourceAtrributesConverter.h

diff --git a/service/basis/common/primitiveResource/include/internal/ResourceAttributesUtils.h b/service/resource-manipulation/modules/common/primitiveResource/include/internal/ResourceAttributesUtils.h
similarity index 100%
rename from service/basis/common/primitiveResource/include/internal/ResourceAttributesUtils.h
rename to service/resource-manipulation/modules/common/primitiveResource/include/internal/ResourceAttributesUtils.h

diff --git a/service/basis/common/primitiveResource/src/PresenceSubscriber.cpp b/service/resource-manipulation/modules/common/primitiveResource/src/PresenceSubscriber.cpp
similarity index 100%
rename from service/basis/common/primitiveResource/src/PresenceSubscriber.cpp
rename to service/resource-manipulation/modules/common/primitiveResource/src/PresenceSubscriber.cpp

diff --git a/service/basis/common/primitiveResource/src/PrimitiveResource.cpp b/service/resource-manipulation/modules/common/primitiveResource/src/PrimitiveResource.cpp
similarity index 100%
rename from service/basis/common/primitiveResource/src/PrimitiveResource.cpp
rename to service/resource-manipulation/modules/common/primitiveResource/src/PrimitiveResource.cpp

diff --git a/service/basis/common/primitiveResource/src/PrimtiveException.cpp b/service/resource-manipulation/modules/common/primitiveResource/src/PrimtiveException.cpp
similarity index 100%
rename from service/basis/common/primitiveResource/src/PrimtiveException.cpp
rename to service/resource-manipulation/modules/common/primitiveResource/src/PrimtiveException.cpp

diff --git a/service/basis/common/primitiveResource/src/ResourceAttributes.cpp b/service/resource-manipulation/modules/common/primitiveResource/src/ResourceAttributes.cpp
similarity index 100%
rename from service/basis/common/primitiveResource/src/ResourceAttributes.cpp
rename to service/resource-manipulation/modules/common/primitiveResource/src/ResourceAttributes.cpp

diff --git a/service/basis/common/primitiveResource/src/ResponseStatement.cpp b/service/resource-manipulation/modules/common/primitiveResource/src/ResponseStatement.cpp
similarity index 100%
rename from service/basis/common/primitiveResource/src/ResponseStatement.cpp
rename to service/resource-manipulation/modules/common/primitiveResource/src/ResponseStatement.cpp

diff --git a/service/basis/common/primitiveResource/unittests/PresenceSubscriberTest.cpp b/service/resource-manipulation/modules/common/primitiveResource/unittests/PresenceSubscriberTest.cpp
similarity index 100%
rename from service/basis/common/primitiveResource/unittests/PresenceSubscriberTest.cpp
rename to service/resource-manipulation/modules/common/primitiveResource/unittests/PresenceSubscriberTest.cpp

diff --git a/service/basis/common/primitiveResource/unittests/PrimitiveResourceTest.cpp b/service/resource-manipulation/modules/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
similarity index 100%
rename from service/basis/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
rename to service/resource-manipulation/modules/common/primitiveResource/unittests/PrimitiveResourceTest.cpp

diff --git a/service/basis/common/primitiveResource/unittests/ResourceAttributesTest.cpp b/service/resource-manipulation/modules/common/primitiveResource/unittests/ResourceAttributesTest.cpp
similarity index 100%
rename from service/basis/common/primitiveResource/unittests/ResourceAttributesTest.cpp
rename to service/resource-manipulation/modules/common/primitiveResource/unittests/ResourceAttributesTest.cpp

diff --git a/service/basis/resourceBroker/SConscript b/service/resource-manipulation/modules/resourceBroker/SConscript
similarity index 100%
rename from service/basis/resourceBroker/SConscript
rename to service/resource-manipulation/modules/resourceBroker/SConscript

diff --git a/service/basis/resourceBroker/include/BrokerTypes.h b/service/resource-manipulation/modules/resourceBroker/include/BrokerTypes.h
similarity index 100%
rename from service/basis/resourceBroker/include/BrokerTypes.h
rename to service/resource-manipulation/modules/resourceBroker/include/BrokerTypes.h

diff --git a/service/basis/resourceBroker/include/DeviceAssociation.h b/service/resource-manipulation/modules/resourceBroker/include/DeviceAssociation.h
similarity index 100%
rename from service/basis/resourceBroker/include/DeviceAssociation.h
rename to service/resource-manipulation/modules/resourceBroker/include/DeviceAssociation.h

diff --git a/service/basis/resourceBroker/include/DevicePresence.h b/service/resource-manipulation/modules/resourceBroker/include/DevicePresence.h
similarity index 100%
rename from service/basis/resourceBroker/include/DevicePresence.h
rename to service/resource-manipulation/modules/resourceBroker/include/DevicePresence.h

diff --git a/service/basis/resourceBroker/include/ResourceBroker.h b/service/resource-manipulation/modules/resourceBroker/include/ResourceBroker.h
similarity index 100%
rename from service/basis/resourceBroker/include/ResourceBroker.h
rename to service/resource-manipulation/modules/resourceBroker/include/ResourceBroker.h

diff --git a/service/basis/resourceBroker/include/ResourcePresence.h b/service/resource-manipulation/modules/resourceBroker/include/ResourcePresence.h
similarity index 100%
rename from service/basis/resourceBroker/include/ResourcePresence.h
rename to service/resource-manipulation/modules/resourceBroker/include/ResourcePresence.h

diff --git a/service/basis/resourceBroker/src/DeviceAssociation.cpp b/service/resource-manipulation/modules/resourceBroker/src/DeviceAssociation.cpp
similarity index 100%
rename from service/basis/resourceBroker/src/DeviceAssociation.cpp
rename to service/resource-manipulation/modules/resourceBroker/src/DeviceAssociation.cpp

diff --git a/service/basis/resourceBroker/src/DevicePresence.cpp b/service/resource-manipulation/modules/resourceBroker/src/DevicePresence.cpp
similarity index 100%
rename from service/basis/resourceBroker/src/DevicePresence.cpp
rename to service/resource-manipulation/modules/resourceBroker/src/DevicePresence.cpp

diff --git a/service/basis/resourceBroker/src/ResourceBroker.cpp b/service/resource-manipulation/modules/resourceBroker/src/ResourceBroker.cpp
similarity index 100%
rename from service/basis/resourceBroker/src/ResourceBroker.cpp
rename to service/resource-manipulation/modules/resourceBroker/src/ResourceBroker.cpp

diff --git a/service/basis/resourceBroker/src/ResourcePresence.cpp b/service/resource-manipulation/modules/resourceBroker/src/ResourcePresence.cpp
similarity index 100%
rename from service/basis/resourceBroker/src/ResourcePresence.cpp
rename to service/resource-manipulation/modules/resourceBroker/src/ResourcePresence.cpp

diff --git a/service/basis/resourceCache/SConscript b/service/resource-manipulation/modules/resourceCache/SConscript
similarity index 100%
rename from service/basis/resourceCache/SConscript
rename to service/resource-manipulation/modules/resourceCache/SConscript

diff --git a/service/basis/resourceCache/include/CacheTypes.h b/service/resource-manipulation/modules/resourceCache/include/CacheTypes.h
similarity index 100%
rename from service/basis/resourceCache/include/CacheTypes.h
rename to service/resource-manipulation/modules/resourceCache/include/CacheTypes.h

diff --git a/service/basis/resourceCache/include/DataCache.h b/service/resource-manipulation/modules/resourceCache/include/DataCache.h
similarity index 100%
rename from service/basis/resourceCache/include/DataCache.h
rename to service/resource-manipulation/modules/resourceCache/include/DataCache.h

diff --git a/service/basis/resourceCache/include/ResourceCacheManager.h b/service/resource-manipulation/modules/resourceCache/include/ResourceCacheManager.h
similarity index 100%
rename from service/basis/resourceCache/include/ResourceCacheManager.h
rename to service/resource-manipulation/modules/resourceCache/include/ResourceCacheManager.h

diff --git a/service/basis/resourceCache/src/DataCache.cpp b/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp
similarity index 100%
rename from service/basis/resourceCache/src/DataCache.cpp
rename to service/resource-manipulation/modules/resourceCache/src/DataCache.cpp

diff --git a/service/basis/resourceCache/src/ResourceCacheManager.cpp b/service/resource-manipulation/modules/resourceCache/src/ResourceCacheManager.cpp
similarity index 100%
rename from service/basis/resourceCache/src/ResourceCacheManager.cpp
rename to service/resource-manipulation/modules/resourceCache/src/ResourceCacheManager.cpp

diff --git a/service/basis/resourceContainer/SConscript b/service/resource-manipulation/modules/resourceContainer/SConscript
similarity index 100%
rename from service/basis/resourceContainer/SConscript
rename to service/resource-manipulation/modules/resourceContainer/SConscript

diff --git a/service/basis/resourceContainer/examples/HueSampleBundle/include/HueConnector.h b/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueConnector.h
similarity index 100%
rename from service/basis/resourceContainer/examples/HueSampleBundle/include/HueConnector.h
rename to service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueConnector.h

diff --git a/service/basis/resourceContainer/examples/HueSampleBundle/include/HueLight.h b/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueLight.h
similarity index 100%
rename from service/basis/resourceContainer/examples/HueSampleBundle/include/HueLight.h
rename to service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueLight.h

diff --git a/service/basis/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h b/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h
similarity index 100%
rename from service/basis/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h
rename to service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h

diff --git a/service/basis/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp b/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp
similarity index 100%
rename from service/basis/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp
rename to service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp

diff --git a/service/basis/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp b/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp
similarity index 100%
rename from service/basis/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp
rename to service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp

diff --git a/service/basis/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp b/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp
similarity index 100%
rename from service/basis/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp
rename to service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp

diff --git a/service/basis/resourceContainer/examples/ResourceContainerConfig.xml b/service/resource-manipulation/modules/resourceContainer/examples/ResourceContainerConfig.xml
similarity index 100%
rename from service/basis/resourceContainer/examples/ResourceContainerConfig.xml
rename to service/resource-manipulation/modules/resourceContainer/examples/ResourceContainerConfig.xml

diff --git a/service/basis/resourceContainer/examples/SampleBundle/include/DiscomfortIndexSensor.h b/service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/include/DiscomfortIndexSensor.h
similarity index 100%
rename from service/basis/resourceContainer/examples/SampleBundle/include/DiscomfortIndexSensor.h
rename to service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/include/DiscomfortIndexSensor.h

diff --git a/service/basis/resourceContainer/examples/SampleBundle/include/DiscomfortIndexSensorResource.h b/service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/include/DiscomfortIndexSensorResource.h
similarity index 100%
rename from service/basis/resourceContainer/examples/SampleBundle/include/DiscomfortIndexSensorResource.h
rename to service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/include/DiscomfortIndexSensorResource.h

diff --git a/service/basis/resourceContainer/examples/SampleBundle/include/SampleBundle.h b/service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/include/SampleBundle.h
similarity index 100%
rename from service/basis/resourceContainer/examples/SampleBundle/include/SampleBundle.h
rename to service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/include/SampleBundle.h

diff --git a/service/basis/resourceContainer/examples/SampleBundle/include/SysTimer.h b/service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/include/SysTimer.h
similarity index 100%
rename from service/basis/resourceContainer/examples/SampleBundle/include/SysTimer.h
rename to service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/include/SysTimer.h

diff --git a/service/basis/resourceContainer/examples/SampleBundle/src/DiscomfortIndexSensor.cpp b/service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/src/DiscomfortIndexSensor.cpp
similarity index 100%
rename from service/basis/resourceContainer/examples/SampleBundle/src/DiscomfortIndexSensor.cpp
rename to service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/src/DiscomfortIndexSensor.cpp

diff --git a/service/basis/resourceContainer/examples/SampleBundle/src/DiscomfortIndexSensorResource.cpp b/service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/src/DiscomfortIndexSensorResource.cpp
similarity index 100%
rename from service/basis/resourceContainer/examples/SampleBundle/src/DiscomfortIndexSensorResource.cpp
rename to service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/src/DiscomfortIndexSensorResource.cpp

diff --git a/service/basis/resourceContainer/examples/SampleBundle/src/SampleBundle.cpp b/service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/src/SampleBundle.cpp
similarity index 100%
rename from service/basis/resourceContainer/examples/SampleBundle/src/SampleBundle.cpp
rename to service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/src/SampleBundle.cpp

diff --git a/service/basis/resourceContainer/examples/SampleBundle/src/SysTimer.cpp b/service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/src/SysTimer.cpp
similarity index 100%
rename from service/basis/resourceContainer/examples/SampleBundle/src/SysTimer.cpp
rename to service/resource-manipulation/modules/resourceContainer/examples/SampleBundle/src/SysTimer.cpp

diff --git a/service/basis/resourceContainer/include/BundleActivator.h b/service/resource-manipulation/modules/resourceContainer/include/BundleActivator.h
similarity index 100%
rename from service/basis/resourceContainer/include/BundleActivator.h
rename to service/resource-manipulation/modules/resourceContainer/include/BundleActivator.h

diff --git a/service/basis/resourceContainer/include/BundleInfo.h b/service/resource-manipulation/modules/resourceContainer/include/BundleInfo.h
similarity index 100%
rename from service/basis/resourceContainer/include/BundleInfo.h
rename to service/resource-manipulation/modules/resourceContainer/include/BundleInfo.h

diff --git a/service/basis/resourceContainer/include/BundleInfoInternal.h b/service/resource-manipulation/modules/resourceContainer/include/BundleInfoInternal.h
similarity index 100%
rename from service/basis/resourceContainer/include/BundleInfoInternal.h
rename to service/resource-manipulation/modules/resourceContainer/include/BundleInfoInternal.h

diff --git a/service/basis/resourceContainer/include/BundleResource.h b/service/resource-manipulation/modules/resourceContainer/include/BundleResource.h
similarity index 100%
rename from service/basis/resourceContainer/include/BundleResource.h
rename to service/resource-manipulation/modules/resourceContainer/include/BundleResource.h

diff --git a/service/basis/resourceContainer/include/Configuration.h b/service/resource-manipulation/modules/resourceContainer/include/Configuration.h
similarity index 100%
rename from service/basis/resourceContainer/include/Configuration.h
rename to service/resource-manipulation/modules/resourceContainer/include/Configuration.h

diff --git a/service/basis/resourceContainer/include/ProtocolBridgeConnector.h b/service/resource-manipulation/modules/resourceContainer/include/ProtocolBridgeConnector.h
similarity index 100%
rename from service/basis/resourceContainer/include/ProtocolBridgeConnector.h
rename to service/resource-manipulation/modules/resourceContainer/include/ProtocolBridgeConnector.h

diff --git a/service/basis/resourceContainer/include/ProtocolBridgeResource.h b/service/resource-manipulation/modules/resourceContainer/include/ProtocolBridgeResource.h
similarity index 100%
rename from service/basis/resourceContainer/include/ProtocolBridgeResource.h
rename to service/resource-manipulation/modules/resourceContainer/include/ProtocolBridgeResource.h

diff --git a/service/basis/resourceContainer/include/ResourceContainer.h b/service/resource-manipulation/modules/resourceContainer/include/ResourceContainer.h
similarity index 100%
rename from service/basis/resourceContainer/include/ResourceContainer.h
rename to service/resource-manipulation/modules/resourceContainer/include/ResourceContainer.h

diff --git a/service/basis/resourceContainer/include/ResourceContainerBundleAPI.h b/service/resource-manipulation/modules/resourceContainer/include/ResourceContainerBundleAPI.h
similarity index 100%
rename from service/basis/resourceContainer/include/ResourceContainerBundleAPI.h
rename to service/resource-manipulation/modules/resourceContainer/include/ResourceContainerBundleAPI.h

diff --git a/service/basis/resourceContainer/include/ResourceContainerImpl.h b/service/resource-manipulation/modules/resourceContainer/include/ResourceContainerImpl.h
similarity index 100%
rename from service/basis/resourceContainer/include/ResourceContainerImpl.h
rename to service/resource-manipulation/modules/resourceContainer/include/ResourceContainerImpl.h

diff --git a/service/basis/resourceContainer/include/SoftSensorResource.h b/service/resource-manipulation/modules/resourceContainer/include/SoftSensorResource.h
similarity index 100%
rename from service/basis/resourceContainer/include/SoftSensorResource.h
rename to service/resource-manipulation/modules/resourceContainer/include/SoftSensorResource.h

diff --git a/service/basis/resourceContainer/src/BundleActivator.cpp b/service/resource-manipulation/modules/resourceContainer/src/BundleActivator.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/BundleActivator.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/BundleActivator.cpp

diff --git a/service/basis/resourceContainer/src/BundleInfo.cpp b/service/resource-manipulation/modules/resourceContainer/src/BundleInfo.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/BundleInfo.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/BundleInfo.cpp

diff --git a/service/basis/resourceContainer/src/BundleInfoInternal.cpp b/service/resource-manipulation/modules/resourceContainer/src/BundleInfoInternal.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/BundleInfoInternal.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/BundleInfoInternal.cpp

diff --git a/service/basis/resourceContainer/src/BundleResource.cpp b/service/resource-manipulation/modules/resourceContainer/src/BundleResource.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/BundleResource.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/BundleResource.cpp

diff --git a/service/basis/resourceContainer/src/Configuration.cpp b/service/resource-manipulation/modules/resourceContainer/src/Configuration.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/Configuration.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/Configuration.cpp

diff --git a/service/basis/resourceContainer/src/ContainerTest.cpp b/service/resource-manipulation/modules/resourceContainer/src/ContainerTest.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/ContainerTest.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/ContainerTest.cpp

diff --git a/service/basis/resourceContainer/src/ProtocolBridgeConnector.cpp b/service/resource-manipulation/modules/resourceContainer/src/ProtocolBridgeConnector.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/ProtocolBridgeConnector.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/ProtocolBridgeConnector.cpp

diff --git a/service/basis/resourceContainer/src/ProtocolBridgeResource.cpp b/service/resource-manipulation/modules/resourceContainer/src/ProtocolBridgeResource.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/ProtocolBridgeResource.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/ProtocolBridgeResource.cpp

diff --git a/service/basis/resourceContainer/src/ResourceContainer.cpp b/service/resource-manipulation/modules/resourceContainer/src/ResourceContainer.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/ResourceContainer.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/ResourceContainer.cpp

diff --git a/service/basis/resourceContainer/src/ResourceContainerBundleAPI.cpp b/service/resource-manipulation/modules/resourceContainer/src/ResourceContainerBundleAPI.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/ResourceContainerBundleAPI.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/ResourceContainerBundleAPI.cpp

diff --git a/service/basis/resourceContainer/src/ResourceContainerImpl.cpp b/service/resource-manipulation/modules/resourceContainer/src/ResourceContainerImpl.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/ResourceContainerImpl.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/ResourceContainerImpl.cpp

diff --git a/service/basis/resourceContainer/src/SoftSensorResource.cpp b/service/resource-manipulation/modules/resourceContainer/src/SoftSensorResource.cpp
similarity index 100%
rename from service/basis/resourceContainer/src/SoftSensorResource.cpp
rename to service/resource-manipulation/modules/resourceContainer/src/SoftSensorResource.cpp

diff --git a/service/basis/serverBuilder/SConscript b/service/resource-manipulation/modules/serverBuilder/SConscript
similarity index 100%
rename from service/basis/serverBuilder/SConscript
rename to service/resource-manipulation/modules/serverBuilder/SConscript

diff --git a/service/basis/serverBuilder/include/PrimitiveRequest.h b/service/resource-manipulation/modules/serverBuilder/include/PrimitiveRequest.h
similarity index 100%
rename from service/basis/serverBuilder/include/PrimitiveRequest.h
rename to service/resource-manipulation/modules/serverBuilder/include/PrimitiveRequest.h

diff --git a/service/basis/serverBuilder/include/PrimitiveResponse.h b/service/resource-manipulation/modules/serverBuilder/include/PrimitiveResponse.h
similarity index 100%
rename from service/basis/serverBuilder/include/PrimitiveResponse.h
rename to service/resource-manipulation/modules/serverBuilder/include/PrimitiveResponse.h

diff --git a/service/basis/serverBuilder/include/PrimitiveServerResource.h b/service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h
similarity index 100%
rename from service/basis/serverBuilder/include/PrimitiveServerResource.h
rename to service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h

diff --git a/service/basis/serverBuilder/include/internal/RequestHandler.h b/service/resource-manipulation/modules/serverBuilder/include/internal/RequestHandler.h
similarity index 100%
rename from service/basis/serverBuilder/include/internal/RequestHandler.h
rename to service/resource-manipulation/modules/serverBuilder/include/internal/RequestHandler.h

diff --git a/service/basis/serverBuilder/src/PrimitiveRequest.cpp b/service/resource-manipulation/modules/serverBuilder/src/PrimitiveRequest.cpp
similarity index 100%
rename from service/basis/serverBuilder/src/PrimitiveRequest.cpp
rename to service/resource-manipulation/modules/serverBuilder/src/PrimitiveRequest.cpp

diff --git a/service/basis/serverBuilder/src/PrimitiveResponse.cpp b/service/resource-manipulation/modules/serverBuilder/src/PrimitiveResponse.cpp
similarity index 100%
rename from service/basis/serverBuilder/src/PrimitiveResponse.cpp
rename to service/resource-manipulation/modules/serverBuilder/src/PrimitiveResponse.cpp

diff --git a/service/basis/serverBuilder/src/PrimitiveServerResource.cpp b/service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp
similarity index 100%
rename from service/basis/serverBuilder/src/PrimitiveServerResource.cpp
rename to service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp

diff --git a/service/basis/serverBuilder/src/RequestHandler.cpp b/service/resource-manipulation/modules/serverBuilder/src/RequestHandler.cpp
similarity index 100%
rename from service/basis/serverBuilder/src/RequestHandler.cpp
rename to service/resource-manipulation/modules/serverBuilder/src/RequestHandler.cpp

diff --git a/service/basis/serverBuilder/unittests/PrimitiveResponseTest.cpp b/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveResponseTest.cpp
similarity index 100%
rename from service/basis/serverBuilder/unittests/PrimitiveResponseTest.cpp
rename to service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveResponseTest.cpp

diff --git a/service/basis/serverBuilder/unittests/PrimitiveServerResourceTest.cpp b/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp
similarity index 100%
rename from service/basis/serverBuilder/unittests/PrimitiveServerResourceTest.cpp
rename to service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp

diff --git a/service/basis/serverBuilder/unittests/RequestHandlerTest.cpp b/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp
similarity index 100%
rename from service/basis/serverBuilder/unittests/RequestHandlerTest.cpp
rename to service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp