diff --git a/core/applications/manifest.clover.json b/core/applications/manifest.clover.json
index af2598e..3d81a76 100644
--- a/core/applications/manifest.clover.json
+++ b/core/applications/manifest.clover.json
@@ -1,3 +1,3 @@
 {
-  "@base.*": "@import('./*/application.clover.json')"
+  "@base.test": "@import('./test/application.clover.json')"
 }
diff --git a/core/gesture-packs/manifest.clover.json b/core/gesture-packs/manifest.clover.json
index 00e735e..174cbd4 100644
--- a/core/gesture-packs/manifest.clover.json
+++ b/core/gesture-packs/manifest.clover.json
@@ -1,3 +1,3 @@
 {
-  "@base.*": "@import('./*/gesture-pack.clover.json')"
+  "@base.default": "@import('./default/gesture-pack.clover.json')"
 }
diff --git a/core/modules/blinkie/module.clover.jsonc b/core/modules/blinkie/module.clover.jsonc
index 6d3869e..02423d1 100644
--- a/core/modules/blinkie/module.clover.jsonc
+++ b/core/modules/blinkie/module.clover.jsonc
@@ -1,6 +1,7 @@
 {
   "name": "C.O.R.E. Blinkie Example",
   "location": "@core.humanoid.chest",
+  "internal": false,
   "components": {
     "light": {
       "type": "indicator",
diff --git a/core/modules/manifest.clover.json b/core/modules/manifest.clover.json
index f4c3b2b..60e6351 100644
--- a/core/modules/manifest.clover.json
+++ b/core/modules/manifest.clover.json
@@ -1,3 +1,4 @@
 {
-  "@base.*": "@import('./*/module.clover.jsonc')"
-}
\ No newline at end of file
+  "@base.blinkie": "@import('./blinkie/module.clover.jsonc')",
+  "@base.two-phase-tail": "@import('./two-phase-tail/module.clover.jsonc')"
+}
diff --git a/core/modules/2-phase-tail/README.md b/core/modules/two-phase-tail/README.md
similarity index 100%
rename from core/modules/2-phase-tail/README.md
rename to core/modules/two-phase-tail/README.md
diff --git a/core/modules/2-phase-tail/module.clover.jsonc b/core/modules/two-phase-tail/module.clover.jsonc
similarity index 95%
rename from core/modules/2-phase-tail/module.clover.jsonc
rename to core/modules/two-phase-tail/module.clover.jsonc
index 8b7bf80..12157e0 100644
--- a/core/modules/2-phase-tail/module.clover.jsonc
+++ b/core/modules/two-phase-tail/module.clover.jsonc
@@ -1,6 +1,6 @@
 {
   // Display name when running through config flows
-  "name": "C.O.R.E. 2-Phase Tail",
+  "name": "C.O.R.E. Two-Phase Tail",
   "location": "@core.humanoid.pelvis.waist",
   "internal": false,
   // define all components. they will be available as the next url segment after com.reboot-codes.clover.CORE.3-phase-tail.components