diff --git a/gbs-control.ino b/gbs-control.ino
index f5efedcb..b7dfbfbf 100644
--- a/gbs-control.ino
+++ b/gbs-control.ino
@@ -1,22 +1,22 @@
-#include "ntsc_240p.h"
-#include "pal_240p.h"
-#include "ntsc_720x480.h"
-#include "pal_768x576.h"
-#include "ntsc_1280x720.h"
-#include "ntsc_1280x1024.h"
-#include "ntsc_1920x1080.h"
-#include "ntsc_downscale.h"
-#include "pal_1280x720.h"
-#include "pal_1280x1024.h"
-#include "pal_1920x1080.h"
-#include "pal_downscale.h"
-#include "presetMdSection.h"
-#include "presetDeinterlacerSection.h"
-#include "presetHdBypassSection.h"
-#include "ofw_RGBS.h"
+#include "presets/ntsc_240p.h"
+#include "presets/pal_240p.h"
+#include "presets/ntsc_720x480.h"
+#include "presets/pal_768x576.h"
+#include "presets/ntsc_1280x720.h"
+#include "presets/ntsc_1280x1024.h"
+#include "presets/ntsc_1920x1080.h"
+#include "presets/ntsc_downscale.h"
+#include "presets/pal_1280x720.h"
+#include "presets/pal_1280x1024.h"
+#include "presets/pal_1920x1080.h"
+#include "presets/pal_downscale.h"
+#include "presets/presetMdSection.h"
+#include "presets/presetDeinterlacerSection.h"
+#include "presets/presetHdBypassSection.h"
+#include "presets/ofw_RGBS.h"
 
 #include <Wire.h>
-#include "tv5725.h"
+#include "presets/tv5725.h"
 #include "framesync.h"
 #include "osd.h"
 
diff --git a/ntsc_1280x1024.h b/presets/ntsc_1280x1024.h
similarity index 100%
rename from ntsc_1280x1024.h
rename to presets/ntsc_1280x1024.h
diff --git a/ntsc_1280x720.h b/presets/ntsc_1280x720.h
similarity index 100%
rename from ntsc_1280x720.h
rename to presets/ntsc_1280x720.h
diff --git a/ntsc_1920x1080.h b/presets/ntsc_1920x1080.h
similarity index 100%
rename from ntsc_1920x1080.h
rename to presets/ntsc_1920x1080.h
diff --git a/ntsc_240p.h b/presets/ntsc_240p.h
similarity index 100%
rename from ntsc_240p.h
rename to presets/ntsc_240p.h
diff --git a/ntsc_720x480.h b/presets/ntsc_720x480.h
similarity index 100%
rename from ntsc_720x480.h
rename to presets/ntsc_720x480.h
diff --git a/ntsc_downscale.h b/presets/ntsc_downscale.h
similarity index 100%
rename from ntsc_downscale.h
rename to presets/ntsc_downscale.h
diff --git a/ofw_RGBS.h b/presets/ofw_RGBS.h
similarity index 100%
rename from ofw_RGBS.h
rename to presets/ofw_RGBS.h
diff --git a/ofw_ypbpr.h b/presets/ofw_ypbpr.h
similarity index 100%
rename from ofw_ypbpr.h
rename to presets/ofw_ypbpr.h
diff --git a/pal_1280x1024.h b/presets/pal_1280x1024.h
similarity index 100%
rename from pal_1280x1024.h
rename to presets/pal_1280x1024.h
diff --git a/pal_1280x720.h b/presets/pal_1280x720.h
similarity index 100%
rename from pal_1280x720.h
rename to presets/pal_1280x720.h
diff --git a/pal_1920x1080.h b/presets/pal_1920x1080.h
similarity index 100%
rename from pal_1920x1080.h
rename to presets/pal_1920x1080.h
diff --git a/pal_240p.h b/presets/pal_240p.h
similarity index 100%
rename from pal_240p.h
rename to presets/pal_240p.h
diff --git a/pal_768x576.h b/presets/pal_768x576.h
similarity index 100%
rename from pal_768x576.h
rename to presets/pal_768x576.h
diff --git a/pal_downscale.h b/presets/pal_downscale.h
similarity index 100%
rename from pal_downscale.h
rename to presets/pal_downscale.h
diff --git a/presetDeinterlacerSection.h b/presets/presetDeinterlacerSection.h
similarity index 100%
rename from presetDeinterlacerSection.h
rename to presets/presetDeinterlacerSection.h
diff --git a/presetHdBypassSection.h b/presets/presetHdBypassSection.h
similarity index 100%
rename from presetHdBypassSection.h
rename to presets/presetHdBypassSection.h
diff --git a/presetMdSection.h b/presets/presetMdSection.h
similarity index 100%
rename from presetMdSection.h
rename to presets/presetMdSection.h
diff --git a/rgbhv.h b/presets/rgbhv.h
similarity index 100%
rename from rgbhv.h
rename to presets/rgbhv.h
diff --git a/tv5725.h b/presets/tv5725.h
similarity index 99%
rename from tv5725.h
rename to presets/tv5725.h
index 286bce8f..6843b90e 100644
--- a/tv5725.h
+++ b/presets/tv5725.h
@@ -1,7 +1,7 @@
 #ifndef TV5725_H_
 #define TV5725_H_
 
-#include "tw.h"
+#include "../tw.h"
 
 #define GBS_ADDR 0x17 // 7 bit GBS I2C Address