Change 'resource-manipulation' folder structure

Move sub-folders of 'modules' to 'src'.
Remove 'modules' folder
Update SConscript according to the folder changes
Disable SConscript of 'resource-manipulation' due to gcc version (jenkins is not gcc4.7)

Change-Id: I90a6f6e0afd3a72a569d70d8c16fd69cad897c8d
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1646
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/SConscript b/service/resource-manipulation/SConscript
index f44943b..d0ea7ec 100644 (file)
--- a/service/resource-manipulation/SConscript
+++ b/service/resource-manipulation/SConscript
@@ -25,11 +25,11 @@ import platform
 
 Import('env')
 
-SConscript('modules/common/SConscript')
-SConscript('modules/resourceBroker/SConscript')
-SConscript('modules/resourceCache/SConscript')
-SConscript('modules/serverBuilder/SConscript')
-SConscript('modules/resourceContainer/SConscript')
+SConscript('src/common/SConscript')
+SConscript('src/resourceBroker/SConscript')
+SConscript('src/resourceCache/SConscript')
+SConscript('src/serverBuilder/SConscript')
+SConscript('src/resourceContainer/SConscript')
 SConscript('sdk/SConscript')
 
 ######################################################################
@@ -55,10 +55,10 @@ target_os = env.get('TARGET_OS')
 # Build flags
 ######################################################################
 resourceClient_env.AppendUnique(CPPPATH = ['include'])
-resourceClient_env.AppendUnique(CPPPATH = ['modules/common/primitiveResource/include'])
-resourceClient_env.AppendUnique(CPPPATH = ['modules/common/expiryTimer/include'])
-resourceClient_env.AppendUnique(CPPPATH = ['modules/resourceBroker/include'])
-resourceClient_env.AppendUnique(CPPPATH = ['modules/resourceCache/include'])
+resourceClient_env.AppendUnique(CPPPATH = ['src/common/primitiveResource/include'])
+resourceClient_env.AppendUnique(CPPPATH = ['src/common/expiryTimer/include'])
+resourceClient_env.AppendUnique(CPPPATH = ['src/resourceBroker/include'])
+resourceClient_env.AppendUnique(CPPPATH = ['src/resourceCache/include'])
 
 
 resourceClient_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])

diff --git a/service/resource-manipulation/examples/linux/SConscript b/service/resource-manipulation/examples/linux/SConscript
index 7014693..86569af 100644 (file)
--- a/service/resource-manipulation/examples/linux/SConscript
+++ b/service/resource-manipulation/examples/linux/SConscript
@@ -36,9 +36,9 @@ ResourceServer_env = lib_env.Clone()
 
 ResourceClient_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
 ResourceClient_env.AppendUnique(LIBS = ['ResourceClient','ResourceCache', 'ResourceBroker', 'ExpiryTimer','service_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'pthread'])
-ResourceClient_env.AppendUnique(CPPPATH = ['../../modules/resourceBroker/include'])
-ResourceClient_env.AppendUnique(CPPPATH = ['../../modules/resourceCache/include'])
-ResourceClient_env.AppendUnique(CPPPATH = ['../../modules/common/primitiveResource/include'])
+ResourceClient_env.AppendUnique(CPPPATH = ['../../src/resourceBroker/include'])
+ResourceClient_env.AppendUnique(CPPPATH = ['../../src/resourceCache/include'])
+ResourceClient_env.AppendUnique(CPPPATH = ['../../src/common/primitiveResource/include'])
 ResourceClient_env.AppendUnique(CPPPATH = ['../../include'])
 
 
@@ -48,8 +48,8 @@ ResourceClient_env.AppendUnique(CPPPATH = ['../../include'])
 
 ResourceServer_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
 ResourceServer_env.AppendUnique(LIBS = ['libserver_builder', 'libservice_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'pthread'])
-ResourceServer_env.AppendUnique(CPPPATH = ['../../modules/common/primitiveResource/include'])
-ResourceServer_env.AppendUnique(CPPPATH = ['../../modules/serverBuilder/include'])
+ResourceServer_env.AppendUnique(CPPPATH = ['../../src/common/primitiveResource/include'])
+ResourceServer_env.AppendUnique(CPPPATH = ['../../src/serverBuilder/include'])
 
 if env.get('SECURED') == '1':
     ResourceClient_env.AppendUnique(LIBS = ['tinydtls'])

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

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

diff --git a/service/resource-manipulation/modules/common/expiryTimer/include/ExpiryTimer.h b/service/resource-manipulation/src/common/expiryTimer/include/ExpiryTimer.h
similarity index 99%
rename from service/resource-manipulation/modules/common/expiryTimer/include/ExpiryTimer.h
rename to service/resource-manipulation/src/common/expiryTimer/include/ExpiryTimer.h
index dd44907..9a57080 100644 (file)
--- a/service/resource-manipulation/modules/common/expiryTimer/include/ExpiryTimer.h
+++ b/service/resource-manipulation/src/common/expiryTimer/include/ExpiryTimer.h
@@ -34,8 +34,6 @@ public:
 
 public:
     ExpiryTimer();
-
-private:
     ~ExpiryTimer();
 
 public:

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

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

diff --git a/service/resource-manipulation/modules/common/expiryTimer/src/ExpiryTimer_Impl.h b/service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer_Impl.h
similarity index 100%
rename from service/resource-manipulation/modules/common/expiryTimer/src/ExpiryTimer_Impl.h
rename to service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer_Impl.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-api/include/NotificationReceiver.h b/service/resource-manipulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/bundle-api/include/NotificationReceiver.h
rename to service/resource-manipulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h

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

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

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

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

diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/pom.xml b/service/resource-manipulation/src/resourceContainer/bundle-java-api/pom.xml
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/pom.xml
rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/pom.xml

diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java
rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java

diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java
rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java

diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java
rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java

diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java
rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java

diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java
rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java

diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml b/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml
rename to service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml

diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java b/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java
rename to service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java

diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java b/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java
rename to service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java

diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java b/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java
rename to service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerInvalidConfig.xml b/service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerInvalidConfig.xml
rename to service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml

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

diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerTestConfig.xml b/service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerTestConfig.xml
rename to service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml

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

diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h b/service/resource-manipulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h
rename to service/resource-manipulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h

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

diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar b/service/resource-manipulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar
similarity index 100%
rename from service/resource-manipulation/modules/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar
rename to service/resource-manipulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar

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

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

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

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

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

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

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

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

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

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

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

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