diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dbf10fa..12651b8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,17 +118,12 @@ SET( CMAKE_CXX_FLAGS "-O3 -Wall")
 
 # Source files definition
 SET(SRC_MAIN
-    src/2xSaI.cpp
-    src/admame.cpp
-    src/bilinear.cpp
     src/bios.cpp
     src/Cheats.cpp
     src/CheatSearch.cpp
     src/EEprom.cpp
     src/Flash.cpp
     src/Globals.cpp
-    src/interframe.cpp
-    src/hq2x.cpp
     src/Mode0.cpp
     src/Mode1.cpp
     src/Mode2.cpp
@@ -136,9 +131,7 @@ SET(SRC_MAIN
     src/Mode4.cpp
     src/Mode5.cpp
     src/Patch.cpp
-    src/pixel.cpp
     src/RTC.cpp
-    src/scanline.cpp
     src/Sound.cpp
     src/Sram.cpp
     src/Util.cpp
@@ -188,16 +181,26 @@ SET(SRC_FEX_MINI
     src/fex_mini.cpp
 )
 
+SET(SRC_FILTERS
+    src/filters/2xSaI.cpp
+    src/filters/admame.cpp
+    src/filters/bilinear.cpp
+    src/filters/hq2x.cpp
+    src/filters/interframe.cpp
+    src/filters/pixel.cpp
+    src/filters/scanline.cpp
+)
+
 SET(SRC_HQ_C
-    src/hq/c/hq_implementation.cpp
+    src/filters/hq/c/hq_implementation.cpp
 )
 
 SET(SRC_HQ_ASM
-    src/hq/asm/hq3x_16.asm
-    src/hq/asm/hq3x_32.asm
-    src/hq/asm/hq4x_16.asm
-    src/hq/asm/hq4x_32.asm
-    src/hq/asm/hq3x32.cpp
+    src/filters/hq/asm/hq3x_16.asm
+    src/filters/hq/asm/hq3x_32.asm
+    src/filters/hq/asm/hq4x_16.asm
+    src/filters/hq/asm/hq4x_32.asm
+    src/filters/hq/asm/hq3x32.cpp
 )
 
 SET(SRC_GTK
@@ -265,6 +268,7 @@ ADD_LIBRARY (
     ${SRC_AGB}
     ${SRC_DMG}
     ${SRC_FEX_MINI}
+    ${SRC_FILTERS}
     ${SRC_DEBUGGER}
 )
 
diff --git a/src/2xSaI.cpp b/src/filters/2xSaI.cpp
similarity index 99%
rename from src/2xSaI.cpp
rename to src/filters/2xSaI.cpp
index ebf7f37a..5dbe2870 100644
--- a/src/2xSaI.cpp
+++ b/src/filters/2xSaI.cpp
@@ -1,5 +1,4 @@
-#include "System.h"
-#include "Port.h"
+#include "../System.h"
 
 extern int RGB_LOW_BITS_MASK;
 
diff --git a/src/2xSaImmx.asm b/src/filters/2xSaImmx.asm
similarity index 100%
rename from src/2xSaImmx.asm
rename to src/filters/2xSaImmx.asm
diff --git a/src/admame.cpp b/src/filters/admame.cpp
similarity index 99%
rename from src/admame.cpp
rename to src/filters/admame.cpp
index b6792c2a..87e32011 100644
--- a/src/admame.cpp
+++ b/src/filters/admame.cpp
@@ -35,7 +35,7 @@
  * - the whole source code of the program is released with the binary.
  */
 
-#include "System.h"
+#include "../System.h"
 
 #ifdef MMX
 extern "C" bool cpu_mmx;
diff --git a/src/bilinear.cpp b/src/filters/bilinear.cpp
similarity index 99%
rename from src/bilinear.cpp
rename to src/filters/bilinear.cpp
index 10b11e77..83ab868f 100644
--- a/src/bilinear.cpp
+++ b/src/filters/bilinear.cpp
@@ -4,7 +4,7 @@
  **	Written: 6/14/00 - JSF
  **/
 
-#include "System.h"
+#include "../System.h"
 
 #define RGB(r,g,b) ((r)>>3) << systemRedShift |\
   ((g) >> 3) << systemGreenShift |\
diff --git a/src/hq/asm/hq3x32.cpp b/src/filters/hq/asm/hq3x32.cpp
similarity index 100%
rename from src/hq/asm/hq3x32.cpp
rename to src/filters/hq/asm/hq3x32.cpp
diff --git a/src/hq/asm/hq3x_16.asm b/src/filters/hq/asm/hq3x_16.asm
similarity index 100%
rename from src/hq/asm/hq3x_16.asm
rename to src/filters/hq/asm/hq3x_16.asm
diff --git a/src/hq/asm/hq3x_32.asm b/src/filters/hq/asm/hq3x_32.asm
similarity index 100%
rename from src/hq/asm/hq3x_32.asm
rename to src/filters/hq/asm/hq3x_32.asm
diff --git a/src/hq/asm/hq4x_16.asm b/src/filters/hq/asm/hq4x_16.asm
similarity index 100%
rename from src/hq/asm/hq4x_16.asm
rename to src/filters/hq/asm/hq4x_16.asm
diff --git a/src/hq/asm/hq4x_32.asm b/src/filters/hq/asm/hq4x_32.asm
similarity index 100%
rename from src/hq/asm/hq4x_32.asm
rename to src/filters/hq/asm/hq4x_32.asm
diff --git a/src/hq/asm/macros.mac b/src/filters/hq/asm/macros.mac
similarity index 100%
rename from src/hq/asm/macros.mac
rename to src/filters/hq/asm/macros.mac
diff --git a/src/hq/c/hq3x_pattern.h b/src/filters/hq/c/hq3x_pattern.h
similarity index 100%
rename from src/hq/c/hq3x_pattern.h
rename to src/filters/hq/c/hq3x_pattern.h
diff --git a/src/hq/c/hq4x_pattern.h b/src/filters/hq/c/hq4x_pattern.h
similarity index 100%
rename from src/hq/c/hq4x_pattern.h
rename to src/filters/hq/c/hq4x_pattern.h
diff --git a/src/hq/c/hq_base.h b/src/filters/hq/c/hq_base.h
similarity index 100%
rename from src/hq/c/hq_base.h
rename to src/filters/hq/c/hq_base.h
diff --git a/src/hq/c/hq_implementation.cpp b/src/filters/hq/c/hq_implementation.cpp
similarity index 100%
rename from src/hq/c/hq_implementation.cpp
rename to src/filters/hq/c/hq_implementation.cpp
diff --git a/src/hq/c/hq_shared.h b/src/filters/hq/c/hq_shared.h
similarity index 100%
rename from src/hq/c/hq_shared.h
rename to src/filters/hq/c/hq_shared.h
diff --git a/src/hq2x.cpp b/src/filters/hq2x.cpp
similarity index 99%
rename from src/hq2x.cpp
rename to src/filters/hq2x.cpp
index d14b8023..33dd3bc1 100644
--- a/src/hq2x.cpp
+++ b/src/filters/hq2x.cpp
@@ -27,7 +27,7 @@
  * file, but you are not obligated to do so.  If you do not wish to
  * do so, delete this exception statement from your version.
  */
-#include "System.h"
+#include "../System.h"
 #include "interp.h"
 
 /***************************************************************************/
diff --git a/src/hq2x.h b/src/filters/hq2x.h
similarity index 100%
rename from src/hq2x.h
rename to src/filters/hq2x.h
diff --git a/src/interframe.cpp b/src/filters/interframe.cpp
similarity index 99%
rename from src/interframe.cpp
rename to src/filters/interframe.cpp
index 1257943f..b3ee723f 100644
--- a/src/interframe.cpp
+++ b/src/filters/interframe.cpp
@@ -1,4 +1,4 @@
-#include "System.h"
+#include "../System.h"
 #include <stdlib.h>
 #include <memory.h>
 
diff --git a/src/interp.h b/src/filters/interp.h
similarity index 100%
rename from src/interp.h
rename to src/filters/interp.h
diff --git a/src/lq2x.h b/src/filters/lq2x.h
similarity index 100%
rename from src/lq2x.h
rename to src/filters/lq2x.h
diff --git a/src/pixel.cpp b/src/filters/pixel.cpp
similarity index 99%
rename from src/pixel.cpp
rename to src/filters/pixel.cpp
index 85ae9e46..079d66c5 100644
--- a/src/pixel.cpp
+++ b/src/filters/pixel.cpp
@@ -1,4 +1,4 @@
-#include "System.h"
+#include "../System.h"
 
 extern int RGB_LOW_BITS_MASK;
 
diff --git a/src/scanline.cpp b/src/filters/scanline.cpp
similarity index 99%
rename from src/scanline.cpp
rename to src/filters/scanline.cpp
index da98f18c..83411577 100644
--- a/src/scanline.cpp
+++ b/src/filters/scanline.cpp
@@ -1,4 +1,4 @@
-#include "System.h"
+#include "../System.h"
 
 extern int RGB_LOW_BITS_MASK;
 
diff --git a/src/simpleFilter.cpp b/src/filters/simpleFilter.cpp
similarity index 99%
rename from src/simpleFilter.cpp
rename to src/filters/simpleFilter.cpp
index 165a2b41..05260a02 100644
--- a/src/simpleFilter.cpp
+++ b/src/filters/simpleFilter.cpp
@@ -1,4 +1,4 @@
-#include "System.h"
+#include "../System.h"
 
 void Simple2x16(u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
               u8 *dstPtr, u32 dstPitch, int width, int height)