diff --git a/.gitmodules b/.gitmodules
index a6812c4..d07ce90 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -437,9 +437,11 @@
 [submodule "GuicedEE/consul-service-resolver"]
 	path = GuicedEE/consul-service-resolver
 	url = https://github.com/GuicedEE/ConsulServiceResolver.git
+	branch = master
 [submodule "GuicedEE/website-backend"]
 	path = GuicedEE/website-backend
 	url = https://github.com/GuicedEE/WebsiteBackend.git
+	branch = master
 [submodule "EntityAssist_Website"]
 	path = EntityAssist/Website
 	url = https://github.com/Entity-Assist/Website.git
diff --git a/.idea/runConfigurations/Entity_Assist_Website.xml b/.idea/runConfigurations/Entity_Assist_Website.xml
index e1d5791..8184723 100644
--- a/.idea/runConfigurations/Entity_Assist_Website.xml
+++ b/.idea/runConfigurations/Entity_Assist_Website.xml
@@ -11,6 +11,7 @@
           </option>
           <option name="goals">
             <list>
+              <option value="compile" />
               <option value="jwebmp-angular:watch" />
             </list>
           </option>
diff --git a/.idea/runConfigurations/GuicedEE_Website.xml b/.idea/runConfigurations/GuicedEE_Website.xml
index ebcf5ff..908fbce 100644
--- a/.idea/runConfigurations/GuicedEE_Website.xml
+++ b/.idea/runConfigurations/GuicedEE_Website.xml
@@ -11,6 +11,7 @@
           </option>
           <option name="goals">
             <list>
+              <option value="compile" />
               <option value="jwebmp-angular:watch" />
             </list>
           </option>
diff --git a/ActivityMaster/cerial b/ActivityMaster/cerial
index 9ea1ffe..b80d51c 160000
--- a/ActivityMaster/cerial
+++ b/ActivityMaster/cerial
@@ -1 +1 @@
-Subproject commit 9ea1ffee7ac5193bfeef18b7a617ae7caf60e697
+Subproject commit b80d51c343f4a3a4f5e83cfdb4484ce5b84440fe
diff --git a/ActivityMaster/client b/ActivityMaster/client
index 16ca427..660a7e0 160000
--- a/ActivityMaster/client
+++ b/ActivityMaster/client
@@ -1 +1 @@
-Subproject commit 16ca427b063e4be496d89374afe5c000a9d61774
+Subproject commit 660a7e04e3af7fe4cff25ea2e4aa01bd10bd90b2
diff --git a/ActivityMaster/core b/ActivityMaster/core
index a34fabc..2267d74 160000
--- a/ActivityMaster/core
+++ b/ActivityMaster/core
@@ -1 +1 @@
-Subproject commit a34fabc7a465e1c0575bf2221a66bb6fd5aab0e0
+Subproject commit 2267d740d7e0dc8d7d6bf83d0ee9796586dd364d
diff --git a/ActivityMaster/geography b/ActivityMaster/geography
index a4ef6a2..f882059 160000
--- a/ActivityMaster/geography
+++ b/ActivityMaster/geography
@@ -1 +1 @@
-Subproject commit a4ef6a2aa9fc874d3ee57a1c5f3fa8295d955ac2
+Subproject commit f88205978db2b82dd5a6fdad662352387daace70
diff --git a/ActivityMaster/images b/ActivityMaster/images
index 23cbe36..bf4838f 160000
--- a/ActivityMaster/images
+++ b/ActivityMaster/images
@@ -1 +1 @@
-Subproject commit 23cbe3666e41b6a74e5deb56cf90376c30ade135
+Subproject commit bf4838ffe8f01bf5bae0eb4de04cfc5f35ab2786
diff --git a/ActivityMaster/mail b/ActivityMaster/mail
index a51a81e..0aafb12 160000
--- a/ActivityMaster/mail
+++ b/ActivityMaster/mail
@@ -1 +1 @@
-Subproject commit a51a81e5e8934a915b6cf72e252a8a8baac69a2b
+Subproject commit 0aafb12411ffab2b76833f9b65938306752adf98
diff --git a/ActivityMaster/profiles b/ActivityMaster/profiles
index ed5ea62..c261e74 160000
--- a/ActivityMaster/profiles
+++ b/ActivityMaster/profiles
@@ -1 +1 @@
-Subproject commit ed5ea6248603696d58728736235177e74fce2e74
+Subproject commit c261e741b922782d5b020ed6e6e929cbec6c247a
diff --git a/ActivityMaster/tasks b/ActivityMaster/tasks
index 0ff02e8..ac4dabd 160000
--- a/ActivityMaster/tasks
+++ b/ActivityMaster/tasks
@@ -1 +1 @@
-Subproject commit 0ff02e800b3d78e1f9d9bb390e3fe706e3d420b3
+Subproject commit ac4dabdd5533a42d97022f6b515671fa8953646c
diff --git a/ActivityMaster/user-sessions b/ActivityMaster/user-sessions
index bf8880f..430ea25 160000
--- a/ActivityMaster/user-sessions
+++ b/ActivityMaster/user-sessions
@@ -1 +1 @@
-Subproject commit bf8880f362531db881c5f8a6ecdb1a12336d5679
+Subproject commit 430ea25f074cb61cc485b270e79717ea8fb4362f
diff --git a/EntityAssist/EntityAssist b/EntityAssist/EntityAssist
index 141b9c7..3502a76 160000
--- a/EntityAssist/EntityAssist
+++ b/EntityAssist/EntityAssist
@@ -1 +1 @@
-Subproject commit 141b9c768af88055f137042c7009c7676e34cdf2
+Subproject commit 3502a76cb6f47e5cf8501a06de138c8917cc3c46
diff --git a/GuicedEE/consul-service-resolver b/GuicedEE/consul-service-resolver
new file mode 160000
index 0000000..26664fb
--- /dev/null
+++ b/GuicedEE/consul-service-resolver
@@ -0,0 +1 @@
+Subproject commit 26664fbbe573041fa3a8f51f48df87c33aa901b2
diff --git a/GuicedEE/rest b/GuicedEE/rest
index c7f5c5d..c225e36 160000
--- a/GuicedEE/rest
+++ b/GuicedEE/rest
@@ -1 +1 @@
-Subproject commit c7f5c5dbed0f52e4c20dd5335db4aee053a02e45
+Subproject commit c225e36c57302b72a3961b46bd7607f86bc44d56
diff --git a/GuicedEE/runtime-autoconfigure b/GuicedEE/runtime-autoconfigure
new file mode 160000
index 0000000..8fc9eb4
--- /dev/null
+++ b/GuicedEE/runtime-autoconfigure
@@ -0,0 +1 @@
+Subproject commit 8fc9eb4153c0f4e72685a3af6de0d3e96bc3d571
diff --git a/GuicedEE/service-discovery b/GuicedEE/service-discovery
new file mode 160000
index 0000000..aceac19
--- /dev/null
+++ b/GuicedEE/service-discovery
@@ -0,0 +1 @@
+Subproject commit aceac19331dde957641cedfa1ee4e9ec035494b6
diff --git a/GuicedEE/service-registry b/GuicedEE/service-registry
new file mode 160000
index 0000000..4184809
--- /dev/null
+++ b/GuicedEE/service-registry
@@ -0,0 +1 @@
+Subproject commit 41848091b46da6fe9becd398d9025ef1e34ea5cf
diff --git a/GuicedEE/services b/GuicedEE/services
index 1b93763..53ba929 160000
--- a/GuicedEE/services
+++ b/GuicedEE/services
@@ -1 +1 @@
-Subproject commit 1b9376377daea8a47039a41973b8758bbca15262
+Subproject commit 53ba929c69cce0fc3a7eff797ff34fde34a5ad7f
diff --git a/GuicedEE/web b/GuicedEE/web
index 30a55de..d42dc55 160000
--- a/GuicedEE/web
+++ b/GuicedEE/web
@@ -1 +1 @@
-Subproject commit 30a55de2d1e72e9aedc36a249d5c0315125983b8
+Subproject commit d42dc5569cf9863fa83a389d15c47699fa6e41ee
diff --git a/GuicedEE/website-backend b/GuicedEE/website-backend
new file mode 160000
index 0000000..8cbd70c
--- /dev/null
+++ b/GuicedEE/website-backend
@@ -0,0 +1 @@
+Subproject commit 8cbd70c1d84cd10dd3ae4fa16d0232572a60f994
diff --git a/JWebMP/plugins/angular b/JWebMP/plugins/angular
index 069c414..4a3512c 160000
--- a/JWebMP/plugins/angular
+++ b/JWebMP/plugins/angular
@@ -1 +1 @@
-Subproject commit 069c4142f2899dbc910d40c920e71701e9541034
+Subproject commit 4a3512c3213450afa9aa02f1535920c5b1d38114
diff --git a/JWebMP/plugins/tsclient b/JWebMP/plugins/tsclient
index 796024b..9262878 160000
--- a/JWebMP/plugins/tsclient
+++ b/JWebMP/plugins/tsclient
@@ -1 +1 @@
-Subproject commit 796024bed8bc8e27dfe7bec8965828de792bbf21
+Subproject commit 92628783ad063bc251be61b142212a4ed7340966
diff --git a/pom.xml b/pom.xml
index 697c3c9..24890b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,6 @@
                 <module>GuicedEE/vertx</module>
                 <module>GuicedEE/cerial</module>
                 <module>GuicedEE/config</module>
-                <module>GuicedEE/consul</module>
                 <module>GuicedEE/consul-service-resolver</module>
                 <module>GuicedEE/metrics</module>
                 <module>GuicedEE/health</module>
@@ -158,7 +157,7 @@
         <profile>
             <id>entityassist</id>
             <modules>
-                <module>EntityAssist</module>
+                <module>EntityAssist/EntityAssist</module>
             </modules>
         </profile>
         <profile>