diff --git a/platformio.ini b/platformio.ini
index a7986a9..693f7b2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = esp01_1m
+;default_envs = esp01_1m
 src_dir = .
 
 [common]
@@ -84,9 +84,11 @@ lib_deps = ${common.lib_deps}
     adafruit/Adafruit NeoPixel@^1.15.1
 build_src_filter = 
     +<examples/neopixel/*.cpp>
-    +<src/*.c>
-    +<src/*.cpp>
-    +<src/services/*.cpp>
+    +<src/spore/*.cpp>
+    +<src/spore/core/*.cpp>
+    +<src/spore/services/*.cpp>
+    +<src/spore/types/*.cpp>
+    +<src/internal/*.cpp>
 
 [env:d1_mini_neopixel]
 platform = platformio/espressif8266@^4.2.1
@@ -100,9 +102,11 @@ lib_deps = ${common.lib_deps}
     adafruit/Adafruit NeoPixel@^1.15.1
 build_src_filter = 
     +<examples/neopixel/*.cpp>
-    +<src/*.c>
-    +<src/*.cpp>
-    +<src/services/*.cpp>
+    +<src/spore/*.cpp>
+    +<src/spore/core/*.cpp>
+    +<src/spore/services/*.cpp>
+    +<src/spore/types/*.cpp>
+    +<src/internal/*.cpp>
 
 [env:esp01_1m_neopattern]
 platform = platformio/espressif8266@^4.2.1
@@ -118,9 +122,11 @@ lib_deps = ${common.lib_deps}
 build_flags = -DLED_STRIP_PIN=2
 build_src_filter = 
     +<examples/neopattern/*.cpp>
-    +<src/*.c>
-    +<src/*.cpp>
-    +<src/services/*.cpp>
+    +<src/spore/*.cpp>
+    +<src/spore/core/*.cpp>
+    +<src/spore/services/*.cpp>
+    +<src/spore/types/*.cpp>
+    +<src/internal/*.cpp>
 
 [env:d1_mini_neopattern]
 platform = platformio/espressif8266@^4.2.1
@@ -134,6 +140,8 @@ lib_deps = ${common.lib_deps}
     adafruit/Adafruit NeoPixel@^1.15.1
 build_src_filter = 
     +<examples/neopattern/*.cpp>
-    +<src/*.c>
-    +<src/*.cpp>
-    +<src/services/*.cpp>
+    +<src/spore/*.cpp>
+    +<src/spore/core/*.cpp>
+    +<src/spore/services/*.cpp>
+    +<src/spore/types/*.cpp>
+    +<src/internal/*.cpp>