diff --git a/all-modules-build/pom.xml b/all-modules-build/pom.xml
index 46a7cdd..5506f7f 100644
--- a/all-modules-build/pom.xml
+++ b/all-modules-build/pom.xml
@@ -5,7 +5,7 @@
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../tip-wlan-cloud-root</relativePath>
+		<relativePath>../wlan-cloud-root</relativePath>
 	</parent>
 
         <artifactId>tip-wlan-cloud-workspace-all-modules-build</artifactId>
@@ -22,10 +22,10 @@
                                 <activeByDefault>true</activeByDefault>
                         </activation>
                         <modules>
-                                <module>../tip-wlan-cloud-root</module>
-                                <module>../tip-wlan-cloud-base/base-build</module>
-                                <module>../tip-wlan-cloud-services/cloud-services-build</module>
-                                <module>../tip-wlan-opensync-wifi-controller/opensync-gateway-build</module>
+                                <module>../wlan-cloud-root</module>
+                                <module>../wlan-cloud-base/base-build</module>
+                                <module>../wlan-cloud-services/cloud-services-build</module>
+                                <module>../wlan-cloud-opensync-controller/opensync-gateway-build</module>
                         </modules>
                 </profile>
         </profiles>
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
deleted file mode 100644
index bfc9c99..0000000
--- a/bitbucket-pipelines.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-image: maven:3.6.1
-
-pipelines:
-  branches:
-    master:  # Trigger this for any pushes to the master branch.
-      - step:
-          name: Build and Deploy Snapshot Artifact
-          trigger: manual # automatic
-          caches:
-            - maven # Cache any dependencies we download, speeds up build times.
-          script:
-            - bash configure_maven.sh # Create our settings.xml file.  Will fail if environment variables aren't set properly.
-            - git submodule update --init
-            - mvn -B --file all-modules-build/pom.xml verify # Ensure all artifacts build successfully before we attempt deploy in order to prevent partial deploys.
-            - mvn -B --file all-modules-build/pom.xml -DskipTests deploy # Now that all builds have completed, we can deploy all the artifacts.
-          artifacts: # This will carry across the files you want to deploy to all subsequent steps
-            - tip-wlan-opensync-wifi-controller/opensync-gateway-static-process/target/opensync-gateway-static-process-0.0.1-SNAPSHOT.jar
-            - tip-wlan-cloud-services/all-cloud-in-one-process/target/all-cloud-in-one-process-0.0.1-SNAPSHOT.jar
-      - step:
-          name: Deploy to Test
-          image: aneitayang/aws-cli:1.0
-          deployment: Test
-          trigger: manual
-          script:
-            - echo "Deploying to test ..."
-            - aws --version
-            - echo "Deploying to Bitbucket Downloads"
-            - echo "https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads"
-            - curl -X POST --user "${BB_AUTH_STRING}" "https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads" --form files=@"tip-wlan-opensync-wifi-controller/opensync-gateway-static-process/target/opensync-gateway-static-process-0.0.1-SNAPSHOT.jar"  
-            - curl -X POST --user "${BB_AUTH_STRING}" "https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads" --form files=@"tip-wlan-cloud-services/all-cloud-in-one-process/target/all-cloud-in-one-process-0.0.1-SNAPSHOT.jar"  
-
diff --git a/configure_maven.sh b/configure_maven.sh
deleted file mode 100644
index fd13ef2..0000000
--- a/configure_maven.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-sed -i~ "/<servers>/ a\
-<server>\
-  <id>io.cloudrepo</id>\
-  <username>${CLOUDREPO_USERNAME}</username>\
-  <password>${CLOUDREPO_PASSPHRASE}</password>\
-</server>" /usr/share/maven/conf/settings.xml
-
diff --git a/tip-wlan-cloud-base b/tip-wlan-cloud-base
deleted file mode 160000
index 22103d6..0000000
--- a/tip-wlan-cloud-base
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 22103d6326a32ce974bd02e3bbb89dab3be31d2a
diff --git a/tip-wlan-cloud-services b/tip-wlan-cloud-services
deleted file mode 160000
index 334173d..0000000
--- a/tip-wlan-cloud-services
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 334173d926e5fe78dc5f8526f77510aea8862295
diff --git a/tip-wlan-opensync-wifi-controller b/tip-wlan-opensync-wifi-controller
deleted file mode 160000
index 8f6cd9e..0000000
--- a/tip-wlan-opensync-wifi-controller
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f6cd9ef10fc064eaadc8dfef134272bffaa1776
diff --git a/wlan-cloud-base b/wlan-cloud-base
new file mode 160000
index 0000000..88144a7
--- /dev/null
+++ b/wlan-cloud-base
@@ -0,0 +1 @@
+Subproject commit 88144a7d349bc588b90cbd1604fa1ed9535cd2ce
diff --git a/wlan-cloud-opensync-controller b/wlan-cloud-opensync-controller
new file mode 160000
index 0000000..0f0286b
--- /dev/null
+++ b/wlan-cloud-opensync-controller
@@ -0,0 +1 @@
+Subproject commit 0f0286bfcb6521323a505cc50e562d4f9964cbc3
diff --git a/tip-wlan-cloud-root b/wlan-cloud-root
similarity index 100%
rename from tip-wlan-cloud-root
rename to wlan-cloud-root
diff --git a/wlan-cloud-services b/wlan-cloud-services
new file mode 160000
index 0000000..9d70025
--- /dev/null
+++ b/wlan-cloud-services
@@ -0,0 +1 @@
+Subproject commit 9d700255968b8b9affb912a7fe48f099e88be8ba