diff --git a/include/effects.h b/include/effects.h
index 40e64b1..24b9f55 100644
--- a/include/effects.h
+++ b/include/effects.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Effect.h"
-#include "effect_clock.h"
-#include "effect_timer.h"
+#include "effects/clock.h"
+#include "effects/timer.h"
 
 struct EffectEntry {
 	const char* name;
diff --git a/include/effect_analogclock.h b/include/effects/analogclock.h
similarity index 100%
rename from include/effect_analogclock.h
rename to include/effects/analogclock.h
diff --git a/include/effect_animation.h b/include/effects/animation.h
similarity index 100%
rename from include/effect_animation.h
rename to include/effects/animation.h
diff --git a/include/effect_bell.h b/include/effects/bell.h
similarity index 100%
rename from include/effect_bell.h
rename to include/effects/bell.h
diff --git a/include/effect_big_clock.h b/include/effects/big_clock.h
similarity index 100%
rename from include/effect_big_clock.h
rename to include/effects/big_clock.h
diff --git a/include/effect_blur2d.h b/include/effects/blur2d.h
similarity index 100%
rename from include/effect_blur2d.h
rename to include/effects/blur2d.h
diff --git a/include/effect_clock.h b/include/effects/clock.h
similarity index 100%
rename from include/effect_clock.h
rename to include/effects/clock.h
diff --git a/include/effect_cycle.h b/include/effects/cycle.h
similarity index 100%
rename from include/effect_cycle.h
rename to include/effects/cycle.h
diff --git a/include/effect_diamond.h b/include/effects/diamond.h
similarity index 100%
rename from include/effect_diamond.h
rename to include/effects/diamond.h
diff --git a/include/effect_dvd.h b/include/effects/dvd.h
similarity index 100%
rename from include/effect_dvd.h
rename to include/effects/dvd.h
diff --git a/include/effect_dynamic.h b/include/effects/dynamic.h
similarity index 100%
rename from include/effect_dynamic.h
rename to include/effects/dynamic.h
diff --git a/include/effect_fire.h b/include/effects/fire.h
similarity index 100%
rename from include/effect_fire.h
rename to include/effects/fire.h
diff --git a/include/effect_firework.h b/include/effects/firework.h
similarity index 100%
rename from include/effect_firework.h
rename to include/effects/firework.h
diff --git a/include/effect_gol.h b/include/effects/gol.h
similarity index 100%
rename from include/effect_gol.h
rename to include/effects/gol.h
diff --git a/include/effect_lightspeed.h b/include/effects/lightspeed.h
similarity index 100%
rename from include/effect_lightspeed.h
rename to include/effects/lightspeed.h
diff --git a/include/effect_marquee.h b/include/effects/marquee.h
similarity index 100%
rename from include/effect_marquee.h
rename to include/effects/marquee.h
diff --git a/include/effect_matrix.h b/include/effects/matrix.h
similarity index 100%
rename from include/effect_matrix.h
rename to include/effects/matrix.h
diff --git a/include/effect_pixelclock.h b/include/effects/pixelclock.h
similarity index 100%
rename from include/effect_pixelclock.h
rename to include/effects/pixelclock.h
diff --git a/include/effect_sinematrix3.h b/include/effects/sinematrix3.h
similarity index 100%
rename from include/effect_sinematrix3.h
rename to include/effects/sinematrix3.h
diff --git a/include/effect_sines.h b/include/effects/sines.h
similarity index 100%
rename from include/effect_sines.h
rename to include/effects/sines.h
diff --git a/include/effect_snake.h b/include/effects/snake.h
similarity index 100%
rename from include/effect_snake.h
rename to include/effects/snake.h
diff --git a/include/effect_static.h b/include/effects/static.h
similarity index 100%
rename from include/effect_static.h
rename to include/effects/static.h
diff --git a/include/effect_timer.h b/include/effects/timer.h
similarity index 100%
rename from include/effect_timer.h
rename to include/effects/timer.h
diff --git a/include/effect_tpm2_net.h b/include/effects/tpm2_net.h
similarity index 100%
rename from include/effect_tpm2_net.h
rename to include/effects/tpm2_net.h
diff --git a/include/effect_tv_static.h b/include/effects/tv_static.h
similarity index 100%
rename from include/effect_tv_static.h
rename to include/effects/tv_static.h
diff --git a/include/effect_twirl.h b/include/effects/twirl.h
similarity index 100%
rename from include/effect_twirl.h
rename to include/effects/twirl.h
diff --git a/src/effects.cpp b/src/effects.cpp
index f9e0345..cd959ca 100644
--- a/src/effects.cpp
+++ b/src/effects.cpp
@@ -1,30 +1,30 @@
 #include "effects.h"
 #include "config.h"
 #include "my_fastled.h"
-#include "effect_bell.h"
-#include "effect_sinematrix3.h"
-#include "effect_big_clock.h"
-#include "effect_clock.h"
-#include "effect_static.h"
-#include "effect_animation.h"
-#include "effect_dynamic.h"
-#include "effect_matrix.h"
-#include "effect_twirl.h"
-#include "effect_cycle.h"
-#include "effect_snake.h"
-#include "effect_fire.h"
-#include "effect_firework.h"
-#include "effect_gol.h"
-#include "effect_pixelclock.h"
-#include "effect_dvd.h"
-#include "effect_analogclock.h"
-#include "effect_sines.h"
-#include "effect_marquee.h"
-#include "effect_blur2d.h"
-#include "effect_tv_static.h"
-#include "effect_lightspeed.h"
-#include "effect_diamond.h"
-#include "effect_tpm2_net.h"
+#include "effects/bell.h"
+#include "effects/sinematrix3.h"
+#include "effects/big_clock.h"
+#include "effects/clock.h"
+#include "effects/static.h"
+#include "effects/animation.h"
+#include "effects/dynamic.h"
+#include "effects/matrix.h"
+#include "effects/twirl.h"
+#include "effects/cycle.h"
+#include "effects/snake.h"
+#include "effects/fire.h"
+#include "effects/firework.h"
+#include "effects/gol.h"
+#include "effects/pixelclock.h"
+#include "effects/dvd.h"
+#include "effects/analogclock.h"
+#include "effects/sines.h"
+#include "effects/marquee.h"
+#include "effects/blur2d.h"
+#include "effects/tv_static.h"
+#include "effects/lightspeed.h"
+#include "effects/diamond.h"
+#include "effects/tpm2_net.h"
 #include "SimpleEffect.h"
 #include "effects/night_clock.h"
 
diff --git a/src/effect_analogclock.cpp b/src/effects/analogclock.cpp
similarity index 96%
rename from src/effect_analogclock.cpp
rename to src/effects/analogclock.cpp
index 0246132..1fe064c 100644
--- a/src/effect_analogclock.cpp
+++ b/src/effects/analogclock.cpp
@@ -1,4 +1,4 @@
-#include "effect_analogclock.h"
+#include "effects/analogclock.h"
 #include "my_fastled.h"
 #include "ntp.h"
 #include <time.h>
diff --git a/src/effect_animation.cpp b/src/effects/animation.cpp
similarity index 97%
rename from src/effect_animation.cpp
rename to src/effects/animation.cpp
index 92484ae..9b2504e 100644
--- a/src/effect_animation.cpp
+++ b/src/effects/animation.cpp
@@ -1,4 +1,4 @@
-#include "effect_animation.h"
+#include "effects/animation.h"
 #include "functions.h"
 
 AnimationEffect::AnimationEffect(const char* name, uint32_t bg, int x, int y) {
diff --git a/src/effect_bell.cpp b/src/effects/bell.cpp
similarity index 94%
rename from src/effect_bell.cpp
rename to src/effects/bell.cpp
index ea2336b..71c904b 100644
--- a/src/effect_bell.cpp
+++ b/src/effects/bell.cpp
@@ -1,6 +1,6 @@
 #include "Effect.h"
 #include "functions.h"
-#include "effect_bell.h"
+#include "effects/bell.h"
 #include "sprites.h"
 
 void BellEffect::loop(uint16_t ms) {
diff --git a/src/effect_big_clock.cpp b/src/effects/big_clock.cpp
similarity index 98%
rename from src/effect_big_clock.cpp
rename to src/effects/big_clock.cpp
index 4d93c99..19b42d3 100644
--- a/src/effect_big_clock.cpp
+++ b/src/effects/big_clock.cpp
@@ -1,5 +1,5 @@
 #include "Effect.h"
-#include "effect_big_clock.h"
+#include "effects/big_clock.h"
 #include "fonts.h"
 #include <time.h>
 #include "settings.h"
diff --git a/src/effect_blur2d.cpp b/src/effects/blur2d.cpp
similarity index 97%
rename from src/effect_blur2d.cpp
rename to src/effects/blur2d.cpp
index 179fcc6..a01bb1e 100644
--- a/src/effect_blur2d.cpp
+++ b/src/effects/blur2d.cpp
@@ -1,4 +1,4 @@
-#include "effect_blur2d.h"
+#include "effects/blur2d.h"
 Blur2DBlob::Blur2DBlob() {
 	_x_freq = random16(6<<8, 15<<8);
 	_y_freq = random16(6<<8, 15<<8);
diff --git a/src/effect_clock.cpp b/src/effects/clock.cpp
similarity index 98%
rename from src/effect_clock.cpp
rename to src/effects/clock.cpp
index a75805b..67ac739 100644
--- a/src/effect_clock.cpp
+++ b/src/effects/clock.cpp
@@ -1,4 +1,4 @@
-#include "effect_clock.h"
+#include "effects/clock.h"
 #include <FastLED.h>
 #include "functions.h"
 #include "fonts.h"
diff --git a/src/effect_cycle.cpp b/src/effects/cycle.cpp
similarity index 99%
rename from src/effect_cycle.cpp
rename to src/effects/cycle.cpp
index 843c78d..719b17b 100644
--- a/src/effect_cycle.cpp
+++ b/src/effects/cycle.cpp
@@ -1,4 +1,4 @@
-#include "effect_cycle.h"
+#include "effects/cycle.h"
 #include "effects.h"
 
 CycleEffect::CycleEffect() {
diff --git a/src/effect_diamond.cpp b/src/effects/diamond.cpp
similarity index 93%
rename from src/effect_diamond.cpp
rename to src/effects/diamond.cpp
index eff96f9..fb4ed7f 100644
--- a/src/effect_diamond.cpp
+++ b/src/effects/diamond.cpp
@@ -1,4 +1,4 @@
-#include "effect_diamond.h"
+#include "effects/diamond.h"
 #include "my_fastled.h"
 
 void DiamondEffect::loop(uint16_t ms) {
diff --git a/src/effect_dvd.cpp b/src/effects/dvd.cpp
similarity index 98%
rename from src/effect_dvd.cpp
rename to src/effects/dvd.cpp
index d4216ec..865a6b2 100644
--- a/src/effect_dvd.cpp
+++ b/src/effects/dvd.cpp
@@ -1,4 +1,4 @@
-#include "effect_dvd.h"
+#include "effects/dvd.h"
 #include "my_fastled.h"
 
 void DvdEffect::loop(uint16_t ms) {
diff --git a/src/effect_dynamic.cpp b/src/effects/dynamic.cpp
similarity index 98%
rename from src/effect_dynamic.cpp
rename to src/effects/dynamic.cpp
index fb92954..fb58d06 100644
--- a/src/effect_dynamic.cpp
+++ b/src/effects/dynamic.cpp
@@ -1,4 +1,4 @@
-#include "effect_dynamic.h"
+#include "effects/dynamic.h"
 #include "functions.h"
 #include "config.h"
 
diff --git a/src/effect_fire.cpp b/src/effects/fire.cpp
similarity index 98%
rename from src/effect_fire.cpp
rename to src/effects/fire.cpp
index 0cf53e6..98a0f2f 100644
--- a/src/effect_fire.cpp
+++ b/src/effects/fire.cpp
@@ -1,4 +1,4 @@
-#include "effect_fire.h"
+#include "effects/fire.h"
 #include "my_color_palettes.h"
 #include "config.h"
 #include "my_fastled.h"
diff --git a/src/effect_firework.cpp b/src/effects/firework.cpp
similarity index 99%
rename from src/effect_firework.cpp
rename to src/effects/firework.cpp
index 21ff5ad..e73c284 100644
--- a/src/effect_firework.cpp
+++ b/src/effects/firework.cpp
@@ -1,5 +1,5 @@
 // Based on https://gist.github.com/kriegsman/68929cbd1d6de4535b20
-#include "effect_firework.h"
+#include "effects/firework.h"
 
 FireworkEffectDot::FireworkEffectDot(Window* w, FireworkEffect* e) {
 	_window = w;
diff --git a/src/effect_gol.cpp b/src/effects/gol.cpp
similarity index 98%
rename from src/effect_gol.cpp
rename to src/effects/gol.cpp
index d8984ca..21abd0a 100644
--- a/src/effect_gol.cpp
+++ b/src/effects/gol.cpp
@@ -1,4 +1,4 @@
-#include "effect_gol.h"
+#include "effects/gol.h"
 #include "my_fastled.h"
 
 GolEffect::GolEffect() {
diff --git a/src/effect_lightspeed.cpp b/src/effects/lightspeed.cpp
similarity index 97%
rename from src/effect_lightspeed.cpp
rename to src/effects/lightspeed.cpp
index 4a9167c..ae29363 100644
--- a/src/effect_lightspeed.cpp
+++ b/src/effects/lightspeed.cpp
@@ -1,4 +1,4 @@
-#include "effect_lightspeed.h"
+#include "effects/lightspeed.h"
 #include "config.h"
 #include "functions.h"
 #include "prototypes.h"
diff --git a/src/effect_marquee.cpp b/src/effects/marquee.cpp
similarity index 95%
rename from src/effect_marquee.cpp
rename to src/effects/marquee.cpp
index 81d84b6..fe92ffe 100644
--- a/src/effect_marquee.cpp
+++ b/src/effects/marquee.cpp
@@ -1,4 +1,4 @@
-#include "effect_marquee.h"
+#include "effects/marquee.h"
 #include "fonts.h"
 
 boolean MarqueeEffect::can_be_shown_with_clock() {
diff --git a/src/effect_matrix.cpp b/src/effects/matrix.cpp
similarity index 99%
rename from src/effect_matrix.cpp
rename to src/effects/matrix.cpp
index 75e4976..bf36a91 100644
--- a/src/effect_matrix.cpp
+++ b/src/effects/matrix.cpp
@@ -1,4 +1,4 @@
-#include "effect_matrix.h"
+#include "effects/matrix.h"
 #include "my_color_palettes.h"
 #include "functions.h"
 
diff --git a/src/effect_pixelclock.cpp b/src/effects/pixelclock.cpp
similarity index 96%
rename from src/effect_pixelclock.cpp
rename to src/effects/pixelclock.cpp
index 632f4c3..73320e1 100644
--- a/src/effect_pixelclock.cpp
+++ b/src/effects/pixelclock.cpp
@@ -1,4 +1,4 @@
-#include "effect_pixelclock.h"
+#include "effects/pixelclock.h"
 #include "ntp.h"
 
 PixelClockEffect::PixelClockEffect() {
diff --git a/src/effect_sinematrix3.cpp b/src/effects/sinematrix3.cpp
similarity index 98%
rename from src/effect_sinematrix3.cpp
rename to src/effects/sinematrix3.cpp
index cb36549..6c8788d 100644
--- a/src/effect_sinematrix3.cpp
+++ b/src/effects/sinematrix3.cpp
@@ -1,4 +1,4 @@
-#include "effect_sinematrix3.h"
+#include "effects/sinematrix3.h"
 #include "prototypes.h"
 #include "functions.h"
 #include "Effect.h"
diff --git a/src/effect_sines.cpp b/src/effects/sines.cpp
similarity index 97%
rename from src/effect_sines.cpp
rename to src/effects/sines.cpp
index 2c1f884..53f8a78 100644
--- a/src/effect_sines.cpp
+++ b/src/effects/sines.cpp
@@ -1,4 +1,4 @@
-#include "effect_sines.h"
+#include "effects/sines.h"
 
 SinesEffectSinus::SinesEffectSinus(Window* w) {
 	_window = w;
diff --git a/src/effect_snake.cpp b/src/effects/snake.cpp
similarity index 99%
rename from src/effect_snake.cpp
rename to src/effects/snake.cpp
index 63ffc7e..396a317 100644
--- a/src/effect_snake.cpp
+++ b/src/effects/snake.cpp
@@ -1,4 +1,4 @@
-#include "effect_snake.h"
+#include "effects/snake.h"
 #include "functions.h"
 
 SnakeEffect::SnakeEffect() {
diff --git a/src/effect_static.cpp b/src/effects/static.cpp
similarity index 88%
rename from src/effect_static.cpp
rename to src/effects/static.cpp
index 9bf406e..f0d00a3 100644
--- a/src/effect_static.cpp
+++ b/src/effects/static.cpp
@@ -1,4 +1,4 @@
-#include "effect_static.h"
+#include "effects/static.h"
 #include "functions.h"
 #include "my_fastled.h"
 
diff --git a/src/effect_timer.cpp b/src/effects/timer.cpp
similarity index 97%
rename from src/effect_timer.cpp
rename to src/effects/timer.cpp
index 6310e0e..c923a30 100644
--- a/src/effect_timer.cpp
+++ b/src/effects/timer.cpp
@@ -1,4 +1,4 @@
-#include "effect_timer.h"
+#include "effects/timer.h"
 #include <FastLED.h>
 #include "functions.h"
 #include "fonts.h"
diff --git a/src/effect_tpm2_net.cpp b/src/effects/tpm2_net.cpp
similarity index 99%
rename from src/effect_tpm2_net.cpp
rename to src/effects/tpm2_net.cpp
index 567f4d5..74bfc48 100644
--- a/src/effect_tpm2_net.cpp
+++ b/src/effects/tpm2_net.cpp
@@ -1,4 +1,4 @@
-#include "effect_tpm2_net.h"
+#include "effects/tpm2_net.h"
 #include "my_fastled.h"
 
 void Tpm2NetEffect::loop(uint16_t ms) {
diff --git a/src/effect_tv_static.cpp b/src/effects/tv_static.cpp
similarity index 96%
rename from src/effect_tv_static.cpp
rename to src/effects/tv_static.cpp
index 0144705..fb9d6ba 100644
--- a/src/effect_tv_static.cpp
+++ b/src/effects/tv_static.cpp
@@ -1,4 +1,4 @@
-#include "effect_tv_static.h"
+#include "effects/tv_static.h"
 
 void TvStaticEffect::loop(uint16_t ms) {
 	//uint8_t dark_position = (millis() % settings.effects.tv_static.black_bar_speed) * _window->width / settings.effects.tv_static.black_bar_speed;
diff --git a/src/effect_twirl.cpp b/src/effects/twirl.cpp
similarity index 96%
rename from src/effect_twirl.cpp
rename to src/effects/twirl.cpp
index 32396ba..74bff15 100644
--- a/src/effect_twirl.cpp
+++ b/src/effects/twirl.cpp
@@ -1,4 +1,4 @@
-#include "effect_twirl.h"
+#include "effects/twirl.h"
 #include "functions.h"
 
 boolean TwirlEffect::can_be_shown_with_clock() { return true; };