diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..9d8d54e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,16 @@
+[submodule "BetterCommons"]
+	path = Assets/BetterCommons
+	url = git@github.com:techno-dwarf-works/better-commons.git
+	branch = upm
+[submodule "BetterInternalCore"]
+	path = Assets/BetterInternalCore
+	url = git@github.com:techno-dwarf-works/better-internal-core.git
+	branch = upm
+[submodule "BetterServices"]
+	path = Assets/BetterServices
+	url = git@github.com:techno-dwarf-works/better-services.git
+	branch = upm
+[submodule "BetterAttributes"]
+	path = Assets/BetterAttributes
+	url = git@github.com:techno-dwarf-works/better-attributes.git
+	branch = upm
diff --git a/Assets/BetterAttributes b/Assets/BetterAttributes
new file mode 160000
index 0000000..6bd91bc
--- /dev/null
+++ b/Assets/BetterAttributes
@@ -0,0 +1 @@
+Subproject commit 6bd91bcb5f364d168b6fe41372a8b560c10a4fb9
diff --git a/Assets/BetterLocators/Samples~.meta b/Assets/BetterAttributes.meta
similarity index 77%
rename from Assets/BetterLocators/Samples~.meta
rename to Assets/BetterAttributes.meta
index 5156dc0..3b90fdf 100644
--- a/Assets/BetterLocators/Samples~.meta
+++ b/Assets/BetterAttributes.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ad0b6793e7643744b8e4a45dabd7cafb
+guid: 4cb91062639ff004c8745f32f45a2b8b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/BetterCommons b/Assets/BetterCommons
new file mode 160000
index 0000000..2a0f166
--- /dev/null
+++ b/Assets/BetterCommons
@@ -0,0 +1 @@
+Subproject commit 2a0f166d3b259f098e5bc658800190b8258603bc
diff --git a/Assets/BetterCommons.meta b/Assets/BetterCommons.meta
new file mode 100644
index 0000000..b7d32ae
--- /dev/null
+++ b/Assets/BetterCommons.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 196a1ee55a4b7fc4d9e2c26e766aafe4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/BetterInternalCore b/Assets/BetterInternalCore
new file mode 160000
index 0000000..dd654e2
--- /dev/null
+++ b/Assets/BetterInternalCore
@@ -0,0 +1 @@
+Subproject commit dd654e230a625f65aa84468bfcc24b6d326521c8
diff --git a/Assets/BetterInternalCore.meta b/Assets/BetterInternalCore.meta
new file mode 100644
index 0000000..845ca65
--- /dev/null
+++ b/Assets/BetterInternalCore.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 75b406821562c054d9928a554972e5e3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef b/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef
index 5e2b78d..470695d 100644
--- a/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef
+++ b/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef
@@ -2,8 +2,8 @@
     "name": "BetterLocators.Runtime",
     "rootNamespace": "Better.Locators.Runtime",
     "references": [
-        "GUID:1c5574afb40e5fe4ca9e9c156009297b",
-        "GUID:8bd4b41f8da90144d9006c4d926c9679"
+        "GUID:8bd4b41f8da90144d9006c4d926c9679",
+        "GUID:1c5574afb40e5fe4ca9e9c156009297b"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -15,7 +15,7 @@
     "versionDefines": [
         {
             "name": "com.tdw.better.services",
-            "expression": "0.1.1",
+            "expression": "0.1.4",
             "define": "BETTER_SERVICES"
         }
     ],
diff --git a/Assets/BetterLocators/package.json b/Assets/BetterLocators/package.json
index 3dbe8ae..474cebb 100644
--- a/Assets/BetterLocators/package.json
+++ b/Assets/BetterLocators/package.json
@@ -1,12 +1,12 @@
 {
   "name": "com.tdw.better.locators",
   "displayName": "Better Locators",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {
     "com.tdw.better.internal.core": "0.0.2",
-    "com.tdw.better.commons": "0.0.7"
+    "com.tdw.better.commons": "0.0.57"
   },
   "author": {
     "name": "Better Plugins",
diff --git a/Assets/BetterServices b/Assets/BetterServices
new file mode 160000
index 0000000..c320a8f
--- /dev/null
+++ b/Assets/BetterServices
@@ -0,0 +1 @@
+Subproject commit c320a8f2d348427834cec6f64c1346ff450077e5
diff --git a/Assets/BetterServices.meta b/Assets/BetterServices.meta
new file mode 100644
index 0000000..81d177f
--- /dev/null
+++ b/Assets/BetterServices.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5408ccbf29f3c234f9159d68cd150ab3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 06195c7..a64183a 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,8 +1,5 @@
 {
   "dependencies": {
-    "com.tdw.better.commons": "0.0.14",
-    "com.tdw.better.internal.core": "0.0.2",
-    "com.tdw.better.services": "0.1.1",
     "com.unity.collab-proxy": "2.0.1",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.18",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index fbe5651..fcc243e 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,30 +1,5 @@
 {
   "dependencies": {
-    "com.tdw.better.commons": {
-      "version": "0.0.14",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
-    "com.tdw.better.internal.core": {
-      "version": "0.0.2",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://package.openupm.com"
-    },
-    "com.tdw.better.services": {
-      "version": "0.1.1",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
     "com.unity.collab-proxy": {
       "version": "2.0.1",
       "depth": 0,
@@ -134,9 +109,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.director": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"