diff --git a/platformio.ini b/platformio.ini
index a9b161f..3d95f09 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -21,9 +21,11 @@ board = ${common.board}
 framework = ${common.framework}
 upload_speed = ${common.upload_speed}
 monitor_baud = ${common.monitor_baud}
-src_filter = +<*> -<examples/> +<examples/pot/>
+src_filter = +<*> -<examples/> +<examples/pot/> -<inputs/> +<inputs/pot>
 lib_deps = ${common.lib_deps}
-
+lib_ignore =
+    Ai Esp32 Rotary Encoder
+    
 [env:pot_esp32]
 platform = espressif32
 board = esp32dev
@@ -31,8 +33,10 @@ framework = ${common.framework}
 build_flags = -std=c++14
 upload_speed = ${common.upload_speed}
 monitor_baud = ${common.monitor_baud}
-src_filter = +<*> -<examples/> +<examples/pot/>
+src_filter = +<*> -<examples/> +<examples/pot/> -<inputs/> +<inputs/pot>
 lib_deps = ${common.lib_deps}  
+lib_ignore =
+    Ai Esp32 Rotary Encoder
 
 [env:rotary_esp32]
 platform = espressif32
@@ -41,6 +45,6 @@ framework = ${common.framework}
 build_flags = -std=c++14
 upload_speed = ${common.upload_speed}
 monitor_baud = ${common.monitor_baud}
-src_filter = +<*> -<examples/> +<examples/rotary/>
+src_filter = +<*> -<examples/> +<examples/rotary/> -<inputs/> +<inputs/rotary>
 lib_deps = ${common.lib_deps}  
     Ai Esp32 Rotary Encoder
\ No newline at end of file
diff --git a/src/examples/pot/main.cpp b/src/examples/pot/main.cpp
index 00a36c9..fb5cb96 100644
--- a/src/examples/pot/main.cpp
+++ b/src/examples/pot/main.cpp
@@ -1,6 +1,6 @@
 #include "config.h"
 #include "Sprocket.h"
-#include "PotPlugin.h"
+#include "inputs/pot/PotPlugin.h"
 
 Sprocket *sprocket;
 
diff --git a/src/examples/rotary/main.cpp b/src/examples/rotary/main.cpp
index eb881c1..6c4017e 100644
--- a/src/examples/rotary/main.cpp
+++ b/src/examples/rotary/main.cpp
@@ -1,6 +1,6 @@
 #include "config.h"
 #include "Sprocket.h"
-#include "RotaryPlugin.h"
+#include "inputs/rotary/RotaryPlugin.h"
 
 Sprocket *sprocket;
 RotaryPlugin *r1;
diff --git a/src/PotPlugin.cpp b/src/inputs/pot/PotPlugin.cpp
similarity index 100%
rename from src/PotPlugin.cpp
rename to src/inputs/pot/PotPlugin.cpp
diff --git a/src/PotPlugin.h b/src/inputs/pot/PotPlugin.h
similarity index 100%
rename from src/PotPlugin.h
rename to src/inputs/pot/PotPlugin.h
diff --git a/src/RotaryPlugin.cpp b/src/inputs/rotary/RotaryPlugin.cpp
similarity index 100%
rename from src/RotaryPlugin.cpp
rename to src/inputs/rotary/RotaryPlugin.cpp
diff --git a/src/RotaryPlugin.h b/src/inputs/rotary/RotaryPlugin.h
similarity index 100%
rename from src/RotaryPlugin.h
rename to src/inputs/rotary/RotaryPlugin.h