diff --git a/LICENSE.txt b/wms/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to wms/LICENSE.txt
diff --git a/NOTICE.txt b/wms/NOTICE.txt
similarity index 100%
rename from NOTICE.txt
rename to wms/NOTICE.txt
diff --git a/README.txt b/wms/README.txt
similarity index 100%
rename from README.txt
rename to wms/README.txt
diff --git a/bin/local-servers.sh b/wms/bin/local-servers.sh
similarity index 100%
rename from bin/local-servers.sh
rename to wms/bin/local-servers.sh
diff --git a/bin/scripts/hp_default_service.py b/wms/bin/scripts/hp_default_service.py
similarity index 100%
rename from bin/scripts/hp_default_service.py
rename to wms/bin/scripts/hp_default_service.py
diff --git a/bin/scripts/sys_shell.py b/wms/bin/scripts/sys_shell.py
similarity index 100%
rename from bin/scripts/sys_shell.py
rename to wms/bin/scripts/sys_shell.py
diff --git a/bin/servers.sh b/wms/bin/servers.sh
similarity index 100%
rename from bin/servers.sh
rename to wms/bin/servers.sh
diff --git a/bin/start-wms.sh b/wms/bin/start-wms.sh
similarity index 100%
rename from bin/start-wms.sh
rename to wms/bin/start-wms.sh
diff --git a/bin/stop-wms.sh b/wms/bin/stop-wms.sh
similarity index 100%
rename from bin/stop-wms.sh
rename to wms/bin/stop-wms.sh
diff --git a/bin/wms b/wms/bin/wms
similarity index 100%
rename from bin/wms
rename to wms/bin/wms
diff --git a/bin/wms-config.sh b/wms/bin/wms-config.sh
similarity index 100%
rename from bin/wms-config.sh
rename to wms/bin/wms-config.sh
diff --git a/bin/wms-daemon.sh b/wms/bin/wms-daemon.sh
similarity index 100%
rename from bin/wms-daemon.sh
rename to wms/bin/wms-daemon.sh
diff --git a/bin/wms-daemons.sh b/wms/bin/wms-daemons.sh
similarity index 100%
rename from bin/wms-daemons.sh
rename to wms/bin/wms-daemons.sh
diff --git a/bin/zookeepers.sh b/wms/bin/zookeepers.sh
similarity index 100%
rename from bin/zookeepers.sh
rename to wms/bin/zookeepers.sh
diff --git a/build.xml b/wms/build.xml
similarity index 100%
rename from build.xml
rename to wms/build.xml
diff --git a/conf/log4j.properties b/wms/conf/log4j.properties
similarity index 100%
rename from conf/log4j.properties
rename to wms/conf/log4j.properties
diff --git a/conf/servers b/wms/conf/servers
similarity index 100%
rename from conf/servers
rename to wms/conf/servers
diff --git a/conf/wms-env.sh b/wms/conf/wms-env.sh
similarity index 100%
rename from conf/wms-env.sh
rename to wms/conf/wms-env.sh
diff --git a/conf/wms-site.xml b/wms/conf/wms-site.xml
similarity index 100%
rename from conf/wms-site.xml
rename to wms/conf/wms-site.xml
diff --git a/pom.xml b/wms/pom.xml
similarity index 100%
rename from pom.xml
rename to wms/pom.xml
diff --git a/src/assembly/all.xml b/wms/src/assembly/all.xml
similarity index 100%
rename from src/assembly/all.xml
rename to wms/src/assembly/all.xml
diff --git a/src/docbkx/book.xml b/wms/src/docbkx/book.xml
similarity index 100%
rename from src/docbkx/book.xml
rename to wms/src/docbkx/book.xml
diff --git a/src/docbkx/configuration.xml b/wms/src/docbkx/configuration.xml
similarity index 100%
rename from src/docbkx/configuration.xml
rename to wms/src/docbkx/configuration.xml
diff --git a/src/docbkx/customization.xsl b/wms/src/docbkx/customization.xsl
similarity index 100%
rename from src/docbkx/customization.xsl
rename to wms/src/docbkx/customization.xsl
diff --git a/src/docbkx/external_apis.xml b/wms/src/docbkx/external_apis.xml
similarity index 100%
rename from src/docbkx/external_apis.xml
rename to wms/src/docbkx/external_apis.xml
diff --git a/src/docbkx/getting_started.xml b/wms/src/docbkx/getting_started.xml
similarity index 100%
rename from src/docbkx/getting_started.xml
rename to wms/src/docbkx/getting_started.xml
diff --git a/src/docbkx/ops_mgt.xml b/wms/src/docbkx/ops_mgt.xml
similarity index 100%
rename from src/docbkx/ops_mgt.xml
rename to wms/src/docbkx/ops_mgt.xml
diff --git a/src/docbkx/performance.xml b/wms/src/docbkx/performance.xml
similarity index 100%
rename from src/docbkx/performance.xml
rename to wms/src/docbkx/performance.xml
diff --git a/src/docbkx/preface.xml b/wms/src/docbkx/preface.xml
similarity index 100%
rename from src/docbkx/preface.xml
rename to wms/src/docbkx/preface.xml
diff --git a/src/docbkx/troubleshooting.xml b/wms/src/docbkx/troubleshooting.xml
similarity index 100%
rename from src/docbkx/troubleshooting.xml
rename to wms/src/docbkx/troubleshooting.xml
diff --git a/src/main/c/INSTALL b/wms/src/main/c/INSTALL
similarity index 100%
rename from src/main/c/INSTALL
rename to wms/src/main/c/INSTALL
diff --git a/src/main/c/Makefile.am b/wms/src/main/c/Makefile.am
similarity index 100%
rename from src/main/c/Makefile.am
rename to wms/src/main/c/Makefile.am
diff --git a/src/main/c/configure.ac b/wms/src/main/c/configure.ac
similarity index 100%
rename from src/main/c/configure.ac
rename to wms/src/main/c/configure.ac
diff --git a/src/main/c/generated/WmsAdminService.cpp b/wms/src/main/c/generated/WmsAdminService.cpp
similarity index 100%
rename from src/main/c/generated/WmsAdminService.cpp
rename to wms/src/main/c/generated/WmsAdminService.cpp
diff --git a/src/main/c/generated/WmsAdminService.h b/wms/src/main/c/generated/WmsAdminService.h
similarity index 100%
rename from src/main/c/generated/WmsAdminService.h
rename to wms/src/main/c/generated/WmsAdminService.h
diff --git a/src/main/c/generated/WmsAdminService_server.skeleton.cpp b/wms/src/main/c/generated/WmsAdminService_server.skeleton.cpp
similarity index 100%
rename from src/main/c/generated/WmsAdminService_server.skeleton.cpp
rename to wms/src/main/c/generated/WmsAdminService_server.skeleton.cpp
diff --git a/src/main/c/generated/WmsService.cpp b/wms/src/main/c/generated/WmsService.cpp
similarity index 100%
rename from src/main/c/generated/WmsService.cpp
rename to wms/src/main/c/generated/WmsService.cpp
diff --git a/src/main/c/generated/WmsService.h b/wms/src/main/c/generated/WmsService.h
similarity index 100%
rename from src/main/c/generated/WmsService.h
rename to wms/src/main/c/generated/WmsService.h
diff --git a/src/main/c/generated/WmsService_constants.cpp b/wms/src/main/c/generated/WmsService_constants.cpp
similarity index 100%
rename from src/main/c/generated/WmsService_constants.cpp
rename to wms/src/main/c/generated/WmsService_constants.cpp
diff --git a/src/main/c/generated/WmsService_constants.h b/wms/src/main/c/generated/WmsService_constants.h
similarity index 100%
rename from src/main/c/generated/WmsService_constants.h
rename to wms/src/main/c/generated/WmsService_constants.h
diff --git a/src/main/c/generated/WmsService_server.skeleton.cpp b/wms/src/main/c/generated/WmsService_server.skeleton.cpp
similarity index 100%
rename from src/main/c/generated/WmsService_server.skeleton.cpp
rename to wms/src/main/c/generated/WmsService_server.skeleton.cpp
diff --git a/src/main/c/generated/WmsService_types.cpp b/wms/src/main/c/generated/WmsService_types.cpp
similarity index 100%
rename from src/main/c/generated/WmsService_types.cpp
rename to wms/src/main/c/generated/WmsService_types.cpp
diff --git a/src/main/c/generated/WmsService_types.h b/wms/src/main/c/generated/WmsService_types.h
similarity index 100%
rename from src/main/c/generated/WmsService_types.h
rename to wms/src/main/c/generated/WmsService_types.h
diff --git a/src/main/c/include/GlobalData.h b/wms/src/main/c/include/GlobalData.h
similarity index 100%
rename from src/main/c/include/GlobalData.h
rename to wms/src/main/c/include/GlobalData.h
diff --git a/src/main/c/include/GlobalHeader.h b/wms/src/main/c/include/GlobalHeader.h
similarity index 100%
rename from src/main/c/include/GlobalHeader.h
rename to wms/src/main/c/include/GlobalHeader.h
diff --git a/src/main/c/include/Wms.h b/wms/src/main/c/include/Wms.h
similarity index 100%
rename from src/main/c/include/Wms.h
rename to wms/src/main/c/include/Wms.h
diff --git a/src/main/c/include/WmsException.h b/wms/src/main/c/include/WmsException.h
similarity index 100%
rename from src/main/c/include/WmsException.h
rename to wms/src/main/c/include/WmsException.h
diff --git a/src/main/c/include/WmsZookeeper.h b/wms/src/main/c/include/WmsZookeeper.h
similarity index 100%
rename from src/main/c/include/WmsZookeeper.h
rename to wms/src/main/c/include/WmsZookeeper.h
diff --git a/src/main/c/src/GlobalData.cpp b/wms/src/main/c/src/GlobalData.cpp
similarity index 100%
rename from src/main/c/src/GlobalData.cpp
rename to wms/src/main/c/src/GlobalData.cpp
diff --git a/src/main/c/src/Wms.cpp b/wms/src/main/c/src/Wms.cpp
similarity index 100%
rename from src/main/c/src/Wms.cpp
rename to wms/src/main/c/src/Wms.cpp
diff --git a/src/main/c/src/WmsException.cpp b/wms/src/main/c/src/WmsException.cpp
similarity index 100%
rename from src/main/c/src/WmsException.cpp
rename to wms/src/main/c/src/WmsException.cpp
diff --git a/src/main/c/src/WmsZookeeper.cpp b/wms/src/main/c/src/WmsZookeeper.cpp
similarity index 100%
rename from src/main/c/src/WmsZookeeper.cpp
rename to wms/src/main/c/src/WmsZookeeper.cpp
diff --git a/src/main/c/tests/wms_test.cpp b/wms/src/main/c/tests/wms_test.cpp
similarity index 100%
rename from src/main/c/tests/wms_test.cpp
rename to wms/src/main/c/tests/wms_test.cpp
diff --git a/src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon b/wms/src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon
similarity index 100%
rename from src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon
rename to wms/src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon
diff --git a/src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon b/wms/src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon
similarity index 100%
rename from src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon
rename to wms/src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon
diff --git a/src/main/java/org/trafodion/wms/Constants.java b/wms/src/main/java/org/trafodion/wms/Constants.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/Constants.java
rename to wms/src/main/java/org/trafodion/wms/Constants.java
diff --git a/src/main/java/org/trafodion/wms/MasterNotRunningException.java b/wms/src/main/java/org/trafodion/wms/MasterNotRunningException.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/MasterNotRunningException.java
rename to wms/src/main/java/org/trafodion/wms/MasterNotRunningException.java
diff --git a/src/main/java/org/trafodion/wms/VersionAnnotation.java b/wms/src/main/java/org/trafodion/wms/VersionAnnotation.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/VersionAnnotation.java
rename to wms/src/main/java/org/trafodion/wms/VersionAnnotation.java
diff --git a/src/main/java/org/trafodion/wms/cep/CepObserver.java b/wms/src/main/java/org/trafodion/wms/cep/CepObserver.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/cep/CepObserver.java
rename to wms/src/main/java/org/trafodion/wms/cep/CepObserver.java
diff --git a/src/main/java/org/trafodion/wms/cep/CepObserverImpl.java b/wms/src/main/java/org/trafodion/wms/cep/CepObserverImpl.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/cep/CepObserverImpl.java
rename to wms/src/main/java/org/trafodion/wms/cep/CepObserverImpl.java
diff --git a/src/main/java/org/trafodion/wms/cep/CepSubject.java b/wms/src/main/java/org/trafodion/wms/cep/CepSubject.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/cep/CepSubject.java
rename to wms/src/main/java/org/trafodion/wms/cep/CepSubject.java
diff --git a/src/main/java/org/trafodion/wms/cep/CepSubjectImpl.java b/wms/src/main/java/org/trafodion/wms/cep/CepSubjectImpl.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/cep/CepSubjectImpl.java
rename to wms/src/main/java/org/trafodion/wms/cep/CepSubjectImpl.java
diff --git a/src/main/java/org/trafodion/wms/cep/ComplexEventProcessor.java b/wms/src/main/java/org/trafodion/wms/cep/ComplexEventProcessor.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/cep/ComplexEventProcessor.java
rename to wms/src/main/java/org/trafodion/wms/cep/ComplexEventProcessor.java
diff --git a/src/main/java/org/trafodion/wms/cep/StreamContext.java b/wms/src/main/java/org/trafodion/wms/cep/StreamContext.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/cep/StreamContext.java
rename to wms/src/main/java/org/trafodion/wms/cep/StreamContext.java
diff --git a/src/main/java/org/trafodion/wms/client/ClientData.java b/wms/src/main/java/org/trafodion/wms/client/ClientData.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/client/ClientData.java
rename to wms/src/main/java/org/trafodion/wms/client/ClientData.java
diff --git a/src/main/java/org/trafodion/wms/client/WmsAdmin.java b/wms/src/main/java/org/trafodion/wms/client/WmsAdmin.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/client/WmsAdmin.java
rename to wms/src/main/java/org/trafodion/wms/client/WmsAdmin.java
diff --git a/src/main/java/org/trafodion/wms/client/WmsClient.java b/wms/src/main/java/org/trafodion/wms/client/WmsClient.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/client/WmsClient.java
rename to wms/src/main/java/org/trafodion/wms/client/WmsClient.java
diff --git a/src/main/java/org/trafodion/wms/client/WmsClientTest.java b/wms/src/main/java/org/trafodion/wms/client/WmsClientTest.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/client/WmsClientTest.java
rename to wms/src/main/java/org/trafodion/wms/client/WmsClientTest.java
diff --git a/src/main/java/org/trafodion/wms/hive/ClientPublisher.java b/wms/src/main/java/org/trafodion/wms/hive/ClientPublisher.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/hive/ClientPublisher.java
rename to wms/src/main/java/org/trafodion/wms/hive/ClientPublisher.java
diff --git a/src/main/java/org/trafodion/wms/hive/PostExecute.java b/wms/src/main/java/org/trafodion/wms/hive/PostExecute.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/hive/PostExecute.java
rename to wms/src/main/java/org/trafodion/wms/hive/PostExecute.java
diff --git a/src/main/java/org/trafodion/wms/hive/PreExecute.java b/wms/src/main/java/org/trafodion/wms/hive/PreExecute.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/hive/PreExecute.java
rename to wms/src/main/java/org/trafodion/wms/hive/PreExecute.java
diff --git a/src/main/java/org/trafodion/wms/http/FilterContainer.java b/wms/src/main/java/org/trafodion/wms/http/FilterContainer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/http/FilterContainer.java
rename to wms/src/main/java/org/trafodion/wms/http/FilterContainer.java
diff --git a/src/main/java/org/trafodion/wms/http/HtmlQuoting.java b/wms/src/main/java/org/trafodion/wms/http/HtmlQuoting.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/http/HtmlQuoting.java
rename to wms/src/main/java/org/trafodion/wms/http/HtmlQuoting.java
diff --git a/src/main/java/org/trafodion/wms/http/HttpServer.java b/wms/src/main/java/org/trafodion/wms/http/HttpServer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/http/HttpServer.java
rename to wms/src/main/java/org/trafodion/wms/http/HttpServer.java
diff --git a/src/main/java/org/trafodion/wms/master/MasterStatusServlet.java b/wms/src/main/java/org/trafodion/wms/master/MasterStatusServlet.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/master/MasterStatusServlet.java
rename to wms/src/main/java/org/trafodion/wms/master/MasterStatusServlet.java
diff --git a/src/main/java/org/trafodion/wms/master/Metrics.java b/wms/src/main/java/org/trafodion/wms/master/Metrics.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/master/Metrics.java
rename to wms/src/main/java/org/trafodion/wms/master/Metrics.java
diff --git a/src/main/java/org/trafodion/wms/master/ServerManager.java b/wms/src/main/java/org/trafodion/wms/master/ServerManager.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/master/ServerManager.java
rename to wms/src/main/java/org/trafodion/wms/master/ServerManager.java
diff --git a/src/main/java/org/trafodion/wms/master/WmsMaster.java b/wms/src/main/java/org/trafodion/wms/master/WmsMaster.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/master/WmsMaster.java
rename to wms/src/main/java/org/trafodion/wms/master/WmsMaster.java
diff --git a/src/main/java/org/trafodion/wms/master/rpc/thrift/ThriftRpcHandler.java b/wms/src/main/java/org/trafodion/wms/master/rpc/thrift/ThriftRpcHandler.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/master/rpc/thrift/ThriftRpcHandler.java
rename to wms/src/main/java/org/trafodion/wms/master/rpc/thrift/ThriftRpcHandler.java
diff --git a/src/main/java/org/trafodion/wms/master/rpc/thrift/ThriftRpcServer.java b/wms/src/main/java/org/trafodion/wms/master/rpc/thrift/ThriftRpcServer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/master/rpc/thrift/ThriftRpcServer.java
rename to wms/src/main/java/org/trafodion/wms/master/rpc/thrift/ThriftRpcServer.java
diff --git a/src/main/java/org/trafodion/wms/rest/GetStatusResponse.java b/wms/src/main/java/org/trafodion/wms/rest/GetStatusResponse.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/GetStatusResponse.java
rename to wms/src/main/java/org/trafodion/wms/rest/GetStatusResponse.java
diff --git a/src/main/java/org/trafodion/wms/rest/RESTServlet.java b/wms/src/main/java/org/trafodion/wms/rest/RESTServlet.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/RESTServlet.java
rename to wms/src/main/java/org/trafodion/wms/rest/RESTServlet.java
diff --git a/src/main/java/org/trafodion/wms/rest/ResourceBase.java b/wms/src/main/java/org/trafodion/wms/rest/ResourceBase.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/ResourceBase.java
rename to wms/src/main/java/org/trafodion/wms/rest/ResourceBase.java
diff --git a/src/main/java/org/trafodion/wms/rest/ResourceConfig.java b/wms/src/main/java/org/trafodion/wms/rest/ResourceConfig.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/ResourceConfig.java
rename to wms/src/main/java/org/trafodion/wms/rest/ResourceConfig.java
diff --git a/src/main/java/org/trafodion/wms/rest/RestConstants.java b/wms/src/main/java/org/trafodion/wms/rest/RestConstants.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/RestConstants.java
rename to wms/src/main/java/org/trafodion/wms/rest/RestConstants.java
diff --git a/src/main/java/org/trafodion/wms/rest/RestHandler.java b/wms/src/main/java/org/trafodion/wms/rest/RestHandler.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/RestHandler.java
rename to wms/src/main/java/org/trafodion/wms/rest/RestHandler.java
diff --git a/src/main/java/org/trafodion/wms/rest/RestServer.java b/wms/src/main/java/org/trafodion/wms/rest/RestServer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/RestServer.java
rename to wms/src/main/java/org/trafodion/wms/rest/RestServer.java
diff --git a/src/main/java/org/trafodion/wms/rest/RootResource.java b/wms/src/main/java/org/trafodion/wms/rest/RootResource.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/RootResource.java
rename to wms/src/main/java/org/trafodion/wms/rest/RootResource.java
diff --git a/src/main/java/org/trafodion/wms/rest/RuleResource.java b/wms/src/main/java/org/trafodion/wms/rest/RuleResource.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/RuleResource.java
rename to wms/src/main/java/org/trafodion/wms/rest/RuleResource.java
diff --git a/src/main/java/org/trafodion/wms/rest/ServerListResource.java b/wms/src/main/java/org/trafodion/wms/rest/ServerListResource.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/ServerListResource.java
rename to wms/src/main/java/org/trafodion/wms/rest/ServerListResource.java
diff --git a/src/main/java/org/trafodion/wms/rest/ServiceResource.java b/wms/src/main/java/org/trafodion/wms/rest/ServiceResource.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/ServiceResource.java
rename to wms/src/main/java/org/trafodion/wms/rest/ServiceResource.java
diff --git a/src/main/java/org/trafodion/wms/rest/StreamResource.java b/wms/src/main/java/org/trafodion/wms/rest/StreamResource.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/StreamResource.java
rename to wms/src/main/java/org/trafodion/wms/rest/StreamResource.java
diff --git a/src/main/java/org/trafodion/wms/rest/VersionResource.java b/wms/src/main/java/org/trafodion/wms/rest/VersionResource.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/VersionResource.java
rename to wms/src/main/java/org/trafodion/wms/rest/VersionResource.java
diff --git a/src/main/java/org/trafodion/wms/rest/WmsRest.java b/wms/src/main/java/org/trafodion/wms/rest/WmsRest.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/WmsRest.java
rename to wms/src/main/java/org/trafodion/wms/rest/WmsRest.java
diff --git a/src/main/java/org/trafodion/wms/rest/WorkloadResource.java b/wms/src/main/java/org/trafodion/wms/rest/WorkloadResource.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/WorkloadResource.java
rename to wms/src/main/java/org/trafodion/wms/rest/WorkloadResource.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/RuleListModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/RuleListModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/RuleListModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/RuleListModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/RuleModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/RuleModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/RuleModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/RuleModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/ServerListModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/ServerListModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/ServerListModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/ServerListModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/ServerModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/ServerModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/ServerModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/ServerModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/StreamListModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/StreamListModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/StreamListModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/StreamListModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/StreamModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/StreamModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/StreamModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/StreamModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/VersionModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/VersionModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/VersionModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/VersionModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/WorkloadListModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/WorkloadListModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/WorkloadListModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/WorkloadListModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/model/WorkloadModel.java b/wms/src/main/java/org/trafodion/wms/rest/model/WorkloadModel.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/model/WorkloadModel.java
rename to wms/src/main/java/org/trafodion/wms/rest/model/WorkloadModel.java
diff --git a/src/main/java/org/trafodion/wms/rest/provider/JAXBContextResolver.java b/wms/src/main/java/org/trafodion/wms/rest/provider/JAXBContextResolver.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/provider/JAXBContextResolver.java
rename to wms/src/main/java/org/trafodion/wms/rest/provider/JAXBContextResolver.java
diff --git a/src/main/java/org/trafodion/wms/rest/provider/producer/PlainTextMessageBodyProducer.java b/wms/src/main/java/org/trafodion/wms/rest/provider/producer/PlainTextMessageBodyProducer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/rest/provider/producer/PlainTextMessageBodyProducer.java
rename to wms/src/main/java/org/trafodion/wms/rest/provider/producer/PlainTextMessageBodyProducer.java
diff --git a/src/main/java/org/trafodion/wms/script/ScriptContext.java b/wms/src/main/java/org/trafodion/wms/script/ScriptContext.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/script/ScriptContext.java
rename to wms/src/main/java/org/trafodion/wms/script/ScriptContext.java
diff --git a/src/main/java/org/trafodion/wms/script/ScriptManager.java b/wms/src/main/java/org/trafodion/wms/script/ScriptManager.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/script/ScriptManager.java
rename to wms/src/main/java/org/trafodion/wms/script/ScriptManager.java
diff --git a/src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java b/wms/src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java
rename to wms/src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java
diff --git a/src/main/java/org/trafodion/wms/server/Metrics.java b/wms/src/main/java/org/trafodion/wms/server/Metrics.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/Metrics.java
rename to wms/src/main/java/org/trafodion/wms/server/Metrics.java
diff --git a/src/main/java/org/trafodion/wms/server/ServerLeaderElection.java b/wms/src/main/java/org/trafodion/wms/server/ServerLeaderElection.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/ServerLeaderElection.java
rename to wms/src/main/java/org/trafodion/wms/server/ServerLeaderElection.java
diff --git a/src/main/java/org/trafodion/wms/server/ServerManager.java b/wms/src/main/java/org/trafodion/wms/server/ServerManager.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/ServerManager.java
rename to wms/src/main/java/org/trafodion/wms/server/ServerManager.java
diff --git a/src/main/java/org/trafodion/wms/server/ServerRestart.java b/wms/src/main/java/org/trafodion/wms/server/ServerRestart.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/ServerRestart.java
rename to wms/src/main/java/org/trafodion/wms/server/ServerRestart.java
diff --git a/src/main/java/org/trafodion/wms/server/ServerStatusServlet.java b/wms/src/main/java/org/trafodion/wms/server/ServerStatusServlet.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/ServerStatusServlet.java
rename to wms/src/main/java/org/trafodion/wms/server/ServerStatusServlet.java
diff --git a/src/main/java/org/trafodion/wms/server/WmsServer.java b/wms/src/main/java/org/trafodion/wms/server/WmsServer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/WmsServer.java
rename to wms/src/main/java/org/trafodion/wms/server/WmsServer.java
diff --git a/src/main/java/org/trafodion/wms/server/connectors/JTClient.java b/wms/src/main/java/org/trafodion/wms/server/connectors/JTClient.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/connectors/JTClient.java
rename to wms/src/main/java/org/trafodion/wms/server/connectors/JTClient.java
diff --git a/src/main/java/org/trafodion/wms/server/connectors/VerticaClient.java b/wms/src/main/java/org/trafodion/wms/server/connectors/VerticaClient.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/connectors/VerticaClient.java
rename to wms/src/main/java/org/trafodion/wms/server/connectors/VerticaClient.java
diff --git a/src/main/java/org/trafodion/wms/server/connectors/YarnClient.java b/wms/src/main/java/org/trafodion/wms/server/connectors/YarnClient.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/connectors/YarnClient.java
rename to wms/src/main/java/org/trafodion/wms/server/connectors/YarnClient.java
diff --git a/src/main/java/org/trafodion/wms/server/rpc/thrift/ThriftRpcHandler.java b/wms/src/main/java/org/trafodion/wms/server/rpc/thrift/ThriftRpcHandler.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/rpc/thrift/ThriftRpcHandler.java
rename to wms/src/main/java/org/trafodion/wms/server/rpc/thrift/ThriftRpcHandler.java
diff --git a/src/main/java/org/trafodion/wms/server/rpc/thrift/ThriftRpcServer.java b/wms/src/main/java/org/trafodion/wms/server/rpc/thrift/ThriftRpcServer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/rpc/thrift/ThriftRpcServer.java
rename to wms/src/main/java/org/trafodion/wms/server/rpc/thrift/ThriftRpcServer.java
diff --git a/src/main/java/org/trafodion/wms/server/stats/PStats.java b/wms/src/main/java/org/trafodion/wms/server/stats/PStats.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/stats/PStats.java
rename to wms/src/main/java/org/trafodion/wms/server/stats/PStats.java
diff --git a/src/main/java/org/trafodion/wms/server/stats/PStatsCpuBusy.java b/wms/src/main/java/org/trafodion/wms/server/stats/PStatsCpuBusy.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/stats/PStatsCpuBusy.java
rename to wms/src/main/java/org/trafodion/wms/server/stats/PStatsCpuBusy.java
diff --git a/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryInfo.java b/wms/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryInfo.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/stats/PStatsMemoryInfo.java
rename to wms/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryInfo.java
diff --git a/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryMonitor.java b/wms/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryMonitor.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/stats/PStatsMemoryMonitor.java
rename to wms/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryMonitor.java
diff --git a/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryUsage.java b/wms/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryUsage.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/stats/PStatsMemoryUsage.java
rename to wms/src/main/java/org/trafodion/wms/server/stats/PStatsMemoryUsage.java
diff --git a/src/main/java/org/trafodion/wms/server/workload/WorkloadStats.java b/wms/src/main/java/org/trafodion/wms/server/workload/WorkloadStats.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/workload/WorkloadStats.java
rename to wms/src/main/java/org/trafodion/wms/server/workload/WorkloadStats.java
diff --git a/src/main/java/org/trafodion/wms/server/workload/WorkloadStore.java b/wms/src/main/java/org/trafodion/wms/server/workload/WorkloadStore.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/workload/WorkloadStore.java
rename to wms/src/main/java/org/trafodion/wms/server/workload/WorkloadStore.java
diff --git a/src/main/java/org/trafodion/wms/server/workload/WorkloadThresholds.java b/wms/src/main/java/org/trafodion/wms/server/workload/WorkloadThresholds.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/workload/WorkloadThresholds.java
rename to wms/src/main/java/org/trafodion/wms/server/workload/WorkloadThresholds.java
diff --git a/src/main/java/org/trafodion/wms/server/workload/WorkloadTrafodionStats.java b/wms/src/main/java/org/trafodion/wms/server/workload/WorkloadTrafodionStats.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/workload/WorkloadTrafodionStats.java
rename to wms/src/main/java/org/trafodion/wms/server/workload/WorkloadTrafodionStats.java
diff --git a/src/main/java/org/trafodion/wms/server/workload/WorkloadsOffender.java b/wms/src/main/java/org/trafodion/wms/server/workload/WorkloadsOffender.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/server/workload/WorkloadsOffender.java
rename to wms/src/main/java/org/trafodion/wms/server/workload/WorkloadsOffender.java
diff --git a/src/main/java/org/trafodion/wms/util/Bytes.java b/wms/src/main/java/org/trafodion/wms/util/Bytes.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/util/Bytes.java
rename to wms/src/main/java/org/trafodion/wms/util/Bytes.java
diff --git a/src/main/java/org/trafodion/wms/util/InfoServer.java b/wms/src/main/java/org/trafodion/wms/util/InfoServer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/util/InfoServer.java
rename to wms/src/main/java/org/trafodion/wms/util/InfoServer.java
diff --git a/src/main/java/org/trafodion/wms/util/RetryCounter.java b/wms/src/main/java/org/trafodion/wms/util/RetryCounter.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/util/RetryCounter.java
rename to wms/src/main/java/org/trafodion/wms/util/RetryCounter.java
diff --git a/src/main/java/org/trafodion/wms/util/RetryCounterFactory.java b/wms/src/main/java/org/trafodion/wms/util/RetryCounterFactory.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/util/RetryCounterFactory.java
rename to wms/src/main/java/org/trafodion/wms/util/RetryCounterFactory.java
diff --git a/src/main/java/org/trafodion/wms/util/Strings.java b/wms/src/main/java/org/trafodion/wms/util/Strings.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/util/Strings.java
rename to wms/src/main/java/org/trafodion/wms/util/Strings.java
diff --git a/src/main/java/org/trafodion/wms/util/VersionInfo.java b/wms/src/main/java/org/trafodion/wms/util/VersionInfo.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/util/VersionInfo.java
rename to wms/src/main/java/org/trafodion/wms/util/VersionInfo.java
diff --git a/src/main/java/org/trafodion/wms/util/WmsConfTool.java b/wms/src/main/java/org/trafodion/wms/util/WmsConfTool.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/util/WmsConfTool.java
rename to wms/src/main/java/org/trafodion/wms/util/WmsConfTool.java
diff --git a/src/main/java/org/trafodion/wms/util/WmsConfiguration.java b/wms/src/main/java/org/trafodion/wms/util/WmsConfiguration.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/util/WmsConfiguration.java
rename to wms/src/main/java/org/trafodion/wms/util/WmsConfiguration.java
diff --git a/src/main/java/org/trafodion/wms/version/util/VerGen.java b/wms/src/main/java/org/trafodion/wms/version/util/VerGen.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/version/util/VerGen.java
rename to wms/src/main/java/org/trafodion/wms/version/util/VerGen.java
diff --git a/src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java b/wms/src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java
rename to wms/src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java
diff --git a/src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java b/wms/src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java
rename to wms/src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java
diff --git a/src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java b/wms/src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java
rename to wms/src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java
diff --git a/src/main/java/org/trafodion/wms/zookeeper/ZkClient.java b/wms/src/main/java/org/trafodion/wms/zookeeper/ZkClient.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/zookeeper/ZkClient.java
rename to wms/src/main/java/org/trafodion/wms/zookeeper/ZkClient.java
diff --git a/src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java b/wms/src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java
similarity index 100%
rename from src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java
rename to wms/src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java
diff --git a/src/main/resources/StringPair.avsc b/wms/src/main/resources/StringPair.avsc
similarity index 100%
rename from src/main/resources/StringPair.avsc
rename to wms/src/main/resources/StringPair.avsc
diff --git a/src/main/resources/platform-stats.avsc b/wms/src/main/resources/platform-stats.avsc
similarity index 100%
rename from src/main/resources/platform-stats.avsc
rename to wms/src/main/resources/platform-stats.avsc
diff --git a/src/main/resources/trafodion-rms.avsc b/wms/src/main/resources/trafodion-rms.avsc
similarity index 100%
rename from src/main/resources/trafodion-rms.avsc
rename to wms/src/main/resources/trafodion-rms.avsc
diff --git a/src/main/resources/wms-default.xml b/wms/src/main/resources/wms-default.xml
similarity index 100%
rename from src/main/resources/wms-default.xml
rename to wms/src/main/resources/wms-default.xml
diff --git a/src/main/resources/wms-webapps/master/index.html b/wms/src/main/resources/wms-webapps/master/index.html
similarity index 100%
rename from src/main/resources/wms-webapps/master/index.html
rename to wms/src/main/resources/wms-webapps/master/index.html
diff --git a/src/main/resources/wms-webapps/master/master.jsp b/wms/src/main/resources/wms-webapps/master/master.jsp
similarity index 100%
rename from src/main/resources/wms-webapps/master/master.jsp
rename to wms/src/main/resources/wms-webapps/master/master.jsp
diff --git a/src/main/resources/wms-webapps/server/index.html b/wms/src/main/resources/wms-webapps/server/index.html
similarity index 100%
rename from src/main/resources/wms-webapps/server/index.html
rename to wms/src/main/resources/wms-webapps/server/index.html
diff --git a/src/main/resources/wms-webapps/server/server.jsp b/wms/src/main/resources/wms-webapps/server/server.jsp
similarity index 100%
rename from src/main/resources/wms-webapps/server/server.jsp
rename to wms/src/main/resources/wms-webapps/server/server.jsp
diff --git a/src/main/resources/wms-webapps/static/favicon.ico b/wms/src/main/resources/wms-webapps/static/favicon.ico
similarity index 100%
rename from src/main/resources/wms-webapps/static/favicon.ico
rename to wms/src/main/resources/wms-webapps/static/favicon.ico
diff --git a/src/main/resources/wms-webapps/static/wms.css b/wms/src/main/resources/wms-webapps/static/wms.css
similarity index 100%
rename from src/main/resources/wms-webapps/static/wms.css
rename to wms/src/main/resources/wms-webapps/static/wms.css
diff --git a/src/main/thrift/WmsService.thrift b/wms/src/main/thrift/WmsService.thrift
similarity index 100%
rename from src/main/thrift/WmsService.thrift
rename to wms/src/main/thrift/WmsService.thrift
diff --git a/src/main/xslt/configuration_to_docbook_section.xsl b/wms/src/main/xslt/configuration_to_docbook_section.xsl
similarity index 100%
rename from src/main/xslt/configuration_to_docbook_section.xsl
rename to wms/src/main/xslt/configuration_to_docbook_section.xsl
diff --git a/src/saveVersion.sh b/wms/src/saveVersion.sh
similarity index 100%
rename from src/saveVersion.sh
rename to wms/src/saveVersion.sh
diff --git a/src/site/resources/css/freebsd_docbook.css b/wms/src/site/resources/css/freebsd_docbook.css
similarity index 100%
rename from src/site/resources/css/freebsd_docbook.css
rename to wms/src/site/resources/css/freebsd_docbook.css
diff --git a/src/site/resources/css/site.css b/wms/src/site/resources/css/site.css
similarity index 100%
rename from src/site/resources/css/site.css
rename to wms/src/site/resources/css/site.css
diff --git a/src/site/resources/images/architecture.gif b/wms/src/site/resources/images/architecture.gif
similarity index 100%
rename from src/site/resources/images/architecture.gif
rename to wms/src/site/resources/images/architecture.gif
diff --git a/src/site/resources/images/favicon.ico b/wms/src/site/resources/images/favicon.ico
similarity index 100%
rename from src/site/resources/images/favicon.ico
rename to wms/src/site/resources/images/favicon.ico
diff --git a/src/site/resources/images/hadoop-logo.jpg b/wms/src/site/resources/images/hadoop-logo.jpg
similarity index 100%
rename from src/site/resources/images/hadoop-logo.jpg
rename to wms/src/site/resources/images/hadoop-logo.jpg
diff --git a/src/site/resources/images/hbase_logo.png b/wms/src/site/resources/images/hbase_logo.png
similarity index 100%
rename from src/site/resources/images/hbase_logo.png
rename to wms/src/site/resources/images/hbase_logo.png
diff --git a/src/site/resources/images/hbase_logo.svg b/wms/src/site/resources/images/hbase_logo.svg
similarity index 100%
rename from src/site/resources/images/hbase_logo.svg
rename to wms/src/site/resources/images/hbase_logo.svg
diff --git a/src/site/resources/images/hfile.png b/wms/src/site/resources/images/hfile.png
similarity index 100%
rename from src/site/resources/images/hfile.png
rename to wms/src/site/resources/images/hfile.png
diff --git a/src/site/resources/images/hfilev2.png b/wms/src/site/resources/images/hfilev2.png
similarity index 100%
rename from src/site/resources/images/hfilev2.png
rename to wms/src/site/resources/images/hfilev2.png
diff --git a/src/site/resources/images/replication_overview.png b/wms/src/site/resources/images/replication_overview.png
similarity index 100%
rename from src/site/resources/images/replication_overview.png
rename to wms/src/site/resources/images/replication_overview.png
diff --git a/src/site/site.vm b/wms/src/site/site.vm
similarity index 100%
rename from src/site/site.vm
rename to wms/src/site/site.vm
diff --git a/src/site/site.xml b/wms/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to wms/src/site/site.xml
diff --git a/src/site/xdoc/acid-semantics.xml b/wms/src/site/xdoc/acid-semantics.xml
similarity index 100%
rename from src/site/xdoc/acid-semantics.xml
rename to wms/src/site/xdoc/acid-semantics.xml
diff --git a/src/site/xdoc/bulk-loads.xml b/wms/src/site/xdoc/bulk-loads.xml
similarity index 100%
rename from src/site/xdoc/bulk-loads.xml
rename to wms/src/site/xdoc/bulk-loads.xml
diff --git a/src/site/xdoc/cygwin.xml b/wms/src/site/xdoc/cygwin.xml
similarity index 100%
rename from src/site/xdoc/cygwin.xml
rename to wms/src/site/xdoc/cygwin.xml
diff --git a/src/site/xdoc/index.xml b/wms/src/site/xdoc/index.xml
similarity index 100%
rename from src/site/xdoc/index.xml
rename to wms/src/site/xdoc/index.xml
diff --git a/src/site/xdoc/metrics.xml b/wms/src/site/xdoc/metrics.xml
similarity index 100%
rename from src/site/xdoc/metrics.xml
rename to wms/src/site/xdoc/metrics.xml
diff --git a/src/site/xdoc/old_news.xml b/wms/src/site/xdoc/old_news.xml
similarity index 100%
rename from src/site/xdoc/old_news.xml
rename to wms/src/site/xdoc/old_news.xml
diff --git a/src/site/xdoc/pseudo-distributed.xml b/wms/src/site/xdoc/pseudo-distributed.xml
similarity index 100%
rename from src/site/xdoc/pseudo-distributed.xml
rename to wms/src/site/xdoc/pseudo-distributed.xml
diff --git a/src/site/xdoc/replication.xml b/wms/src/site/xdoc/replication.xml
similarity index 100%
rename from src/site/xdoc/replication.xml
rename to wms/src/site/xdoc/replication.xml
diff --git a/src/site/xdoc/sponsors.xml b/wms/src/site/xdoc/sponsors.xml
similarity index 100%
rename from src/site/xdoc/sponsors.xml
rename to wms/src/site/xdoc/sponsors.xml
diff --git a/src/test/java/org/trafodion/wms/AppTest.java b/wms/src/test/java/org/trafodion/wms/AppTest.java
similarity index 100%
rename from src/test/java/org/trafodion/wms/AppTest.java
rename to wms/src/test/java/org/trafodion/wms/AppTest.java
diff --git a/src/test/java/org/trafodion/wms/LargeTests.java b/wms/src/test/java/org/trafodion/wms/LargeTests.java
similarity index 100%
rename from src/test/java/org/trafodion/wms/LargeTests.java
rename to wms/src/test/java/org/trafodion/wms/LargeTests.java
diff --git a/src/test/java/org/trafodion/wms/MediumTests.java b/wms/src/test/java/org/trafodion/wms/MediumTests.java
similarity index 100%
rename from src/test/java/org/trafodion/wms/MediumTests.java
rename to wms/src/test/java/org/trafodion/wms/MediumTests.java
diff --git a/src/test/java/org/trafodion/wms/MemoryMapTest.java b/wms/src/test/java/org/trafodion/wms/MemoryMapTest.java
similarity index 100%
rename from src/test/java/org/trafodion/wms/MemoryMapTest.java
rename to wms/src/test/java/org/trafodion/wms/MemoryMapTest.java
diff --git a/src/test/java/org/trafodion/wms/SmallTests.java b/wms/src/test/java/org/trafodion/wms/SmallTests.java
similarity index 100%
rename from src/test/java/org/trafodion/wms/SmallTests.java
rename to wms/src/test/java/org/trafodion/wms/SmallTests.java
diff --git a/src/test/java/org/trafodion/wms/ZkDataTest.java b/wms/src/test/java/org/trafodion/wms/ZkDataTest.java
similarity index 100%
rename from src/test/java/org/trafodion/wms/ZkDataTest.java
rename to wms/src/test/java/org/trafodion/wms/ZkDataTest.java
diff --git a/src/test/java/org/trafodion/wms/ZkStatsTest.java b/wms/src/test/java/org/trafodion/wms/ZkStatsTest.java
similarity index 100%
rename from src/test/java/org/trafodion/wms/ZkStatsTest.java
rename to wms/src/test/java/org/trafodion/wms/ZkStatsTest.java
diff --git a/src/test/resources/wms-default.xml b/wms/src/test/resources/wms-default.xml
similarity index 100%
rename from src/test/resources/wms-default.xml
rename to wms/src/test/resources/wms-default.xml