diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70d348e..779ad19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <DEFINES
 # Sointu as a header-only library 
 set(HEADERLIB sointuinterface)
 add_library(${HEADERLIB} INTERFACE)
-target_include_directories(${HEADERLIB} INTERFACE ${PROJECT_SOURCE_DIR}/include/sointu)
+target_include_directories(${HEADERLIB} INTERFACE ${PROJECT_SOURCE_DIR}/include)
 
 # Sointu as static library
 set(STATICLIB sointu)
diff --git a/include/sointu/opcodes/arithmetic_footer.inc b/include/sointu/arithmetic_footer.inc
similarity index 100%
rename from include/sointu/opcodes/arithmetic_footer.inc
rename to include/sointu/arithmetic_footer.inc
diff --git a/include/sointu/opcodes/arithmetic_header.inc b/include/sointu/arithmetic_header.inc
similarity index 100%
rename from include/sointu/opcodes/arithmetic_header.inc
rename to include/sointu/arithmetic_header.inc
diff --git a/include/sointu/opcodes/effects_footer.inc b/include/sointu/effects_footer.inc
similarity index 100%
rename from include/sointu/opcodes/effects_footer.inc
rename to include/sointu/effects_footer.inc
diff --git a/include/sointu/opcodes/effects_header.inc b/include/sointu/effects_header.inc
similarity index 100%
rename from include/sointu/opcodes/effects_header.inc
rename to include/sointu/effects_header.inc
diff --git a/include/sointu/opcodes/flowcontrol_footer.inc b/include/sointu/flowcontrol_footer.inc
similarity index 100%
rename from include/sointu/opcodes/flowcontrol_footer.inc
rename to include/sointu/flowcontrol_footer.inc
diff --git a/include/sointu/opcodes/flowcontrol_header.inc b/include/sointu/flowcontrol_header.inc
similarity index 100%
rename from include/sointu/opcodes/flowcontrol_header.inc
rename to include/sointu/flowcontrol_header.inc
diff --git a/include/sointu/sointu_footer.inc b/include/sointu/footer.inc
similarity index 98%
rename from include/sointu/sointu_footer.inc
rename to include/sointu/footer.inc
index 4daba8a..a3d98ae 100644
--- a/include/sointu/sointu_footer.inc
+++ b/include/sointu/footer.inc
@@ -488,22 +488,22 @@ su_update_voices_skipadd:
 ;-------------------------------------------------------------------------------
 ;   Include the rest of the code
 ;-------------------------------------------------------------------------------
-%include "opcodes/arithmetic_footer.inc"
-%include "opcodes/flowcontrol_footer.inc"
-%include "opcodes/sources_footer.inc"
-%include "opcodes/sinks_footer.inc"
+%include "sointu/arithmetic_footer.inc"
+%include "sointu/flowcontrol_footer.inc"
+%include "sointu/sources_footer.inc"
+%include "sointu/sinks_footer.inc"
 ; warning: at the moment effects has to be assembled after
 ; sources, as sources.asm defines SU_USE_WAVESHAPER
 ; if needed.
-%include "opcodes/effects_footer.inc"
-%include "introspection_footer.inc"
+%include "sointu/effects_footer.inc"
+%include "sointu/introspection_footer.inc"
 
 %ifidn __OUTPUT_FORMAT__,win64
-    %include "win64/gmdls_win64_footer.inc"
+    %include "sointu/win64/gmdls_win64_footer.inc"
 %endif
 
 %ifidn __OUTPUT_FORMAT__,win32
-    %include "win32/gmdls_win32_footer.inc"
+    %include "sointu/win32/gmdls_win32_footer.inc"
 %endif
 
 ;-------------------------------------------------------------------------------
diff --git a/include/sointu/sointu_header.inc b/include/sointu/header.inc
similarity index 97%
rename from include/sointu/sointu_header.inc
rename to include/sointu/header.inc
index 44351d7..ee19473 100644
--- a/include/sointu/sointu_header.inc
+++ b/include/sointu/header.inc
@@ -88,11 +88,11 @@
 
 section .text ; yasm throws section redeclaration warnings if strucs are defined without a plain .text section
 
-%include "opcodes/flowcontrol_header.inc"
-%include "opcodes/arithmetic_header.inc"
-%include "opcodes/effects_header.inc"
-%include "opcodes/sources_header.inc"
-%include "opcodes/sinks_header.inc"
+%include "sointu/flowcontrol_header.inc"
+%include "sointu/arithmetic_header.inc"
+%include "sointu/effects_header.inc"
+%include "sointu/sources_header.inc"
+%include "sointu/sinks_header.inc"
 
 ;-------------------------------------------------------------------------------
 ;   synth defines
diff --git a/include/sointu/opcodes/sinks_footer.inc b/include/sointu/sinks_footer.inc
similarity index 100%
rename from include/sointu/opcodes/sinks_footer.inc
rename to include/sointu/sinks_footer.inc
diff --git a/include/sointu/opcodes/sinks_header.inc b/include/sointu/sinks_header.inc
similarity index 100%
rename from include/sointu/opcodes/sinks_header.inc
rename to include/sointu/sinks_header.inc
diff --git a/include/sointu/opcodes/sources_footer.inc b/include/sointu/sources_footer.inc
similarity index 100%
rename from include/sointu/opcodes/sources_footer.inc
rename to include/sointu/sources_footer.inc
diff --git a/include/sointu/opcodes/sources_header.inc b/include/sointu/sources_header.inc
similarity index 100%
rename from include/sointu/opcodes/sources_header.inc
rename to include/sointu/sources_header.inc
diff --git a/render.asm b/render.asm
index 8a5f76e..c07ecb9 100644
--- a/render.asm
+++ b/render.asm
@@ -1,7 +1,7 @@
 ; source file for compiling sointu as a library
 %define SU_DISABLE_PLAYER
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 ; TODO: make sure compile everything in
 
@@ -21,7 +21,7 @@ USE_OUT
 %define INCLUDE_POLYPHONY
 %define INCLUDE_MULTIVOICE_TRACKS
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
 
 section .text
 
diff --git a/tests/test_add.asm b/tests/test_add.asm
index 4731a1f..9c6ea15 100644
--- a/tests/test_add.asm
+++ b/tests/test_add.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0,
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_add_stereo.asm b/tests/test_add_stereo.asm
index 48f04db..c3064a0 100644
--- a/tests/test_add_stereo.asm
+++ b/tests/test_add_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0,
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_addp.asm b/tests/test_addp.asm
index 6a85f8c..1668225 100644
--- a/tests/test_addp.asm
+++ b/tests/test_addp.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_addp_stereo.asm b/tests/test_addp_stereo.asm
index 6824d42..6fe1f9d 100644
--- a/tests/test_addp_stereo.asm
+++ b/tests/test_addp_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_aux.asm b/tests/test_aux.asm
index f65245c..10b13bd 100644
--- a/tests/test_aux.asm
+++ b/tests/test_aux.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_aux_stereo.asm b/tests/test_aux_stereo.asm
index f54144b..1f4e5e3 100644
--- a/tests/test_aux_stereo.asm
+++ b/tests/test_aux_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -25,4 +25,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_chords.asm b/tests/test_chords.asm
index b68d8d6..a71b50d 100644
--- a/tests/test_chords.asm
+++ b/tests/test_chords.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 0, 0, 68, 0, 0, 0,    66, 0, 0, 0,   69, 0, 0, 0,
@@ -25,4 +25,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_clip.asm b/tests/test_clip.asm
index 3f33c38..3835b05 100644
--- a/tests/test_clip.asm
+++ b/tests/test_clip.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_clip_stereo.asm b/tests/test_clip_stereo.asm
index 9a83a06..5209bf7 100644
--- a/tests/test_clip_stereo.asm
+++ b/tests/test_clip_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_compressor.asm b/tests/test_compressor.asm
index 775363b..ec6650d 100644
--- a/tests/test_compressor.asm
+++ b/tests/test_compressor.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 64, 64, 64, 64,  64, 64, 64, 64, 64, 64, 64,   65, 65, 65, 65,
@@ -39,4 +39,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm
index a48b99e..3555c01 100644
--- a/tests/test_compressor_stereo.asm
+++ b/tests/test_compressor_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 64, 64, 64, 64,  64, 64, 64, 64, 64, 64, 64,   65, 65, 65, 65,
@@ -39,4 +39,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_crush.asm b/tests/test_crush.asm
index ac3405c..05f2658 100644
--- a/tests/test_crush.asm
+++ b/tests/test_crush.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_crush_stereo.asm b/tests/test_crush_stereo.asm
index 4326d97..8206a8a 100644
--- a/tests/test_crush_stereo.asm
+++ b/tests/test_crush_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay.asm b/tests/test_delay.asm
index 06bab0e..93b688d 100644
--- a/tests/test_delay.asm
+++ b/tests/test_delay.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -25,4 +25,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm
index e8b0c3d..fa5fd58 100644
--- a/tests/test_delay_dampmod.asm
+++ b/tests/test_delay_dampmod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -27,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm
index 91bd5c8..ad9a28b 100644
--- a/tests/test_delay_drymod.asm
+++ b/tests/test_delay_drymod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -27,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm
index 5ac75ad..bfdbc68 100644
--- a/tests/test_delay_feedbackmod.asm
+++ b/tests/test_delay_feedbackmod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -27,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay_flanger.asm b/tests/test_delay_flanger.asm
index 3dddbad..b2cb124 100644
--- a/tests/test_delay_flanger.asm
+++ b/tests/test_delay_flanger.asm
@@ -1,7 +1,7 @@
 %define BPM 100
 %define INCLUDE_DELAY_MODULATION
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0
@@ -28,4 +28,4 @@ BEGIN_DELTIMES
     DELTIME 1000
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm
index 226d2e6..8a7a1a4 100644
--- a/tests/test_delay_notetracking.asm
+++ b/tests/test_delay_notetracking.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -31,4 +31,4 @@ BEGIN_DELTIMES
     DELTIME 10787
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm
index 4d77dea..632bbea 100644
--- a/tests/test_delay_pregainmod.asm
+++ b/tests/test_delay_pregainmod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -27,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm
index 542662c..2c189d7 100644
--- a/tests/test_delay_reverb.asm
+++ b/tests/test_delay_reverb.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -25,4 +25,4 @@ BEGIN_DELTIMES
     DELTIME 1116,1188,1276,1356,1422,1492,1556,1618
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm
index 250bcc5..991a129 100644
--- a/tests/test_delay_stereo.asm
+++ b/tests/test_delay_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -26,4 +26,4 @@ BEGIN_DELTIMES
     DELTIME 21025
 END_DELTIMES
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_distort.asm b/tests/test_distort.asm
index 3a15013..11e2c1a 100644
--- a/tests/test_distort.asm
+++ b/tests/test_distort.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_distort_mod.asm b/tests/test_distort_mod.asm
index 20a90dc..d052f8c 100644
--- a/tests/test_distort_mod.asm
+++ b/tests/test_distort_mod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_distort_stereo.asm b/tests/test_distort_stereo.asm
index 5bda97f..44fa9fb 100644
--- a/tests/test_distort_stereo.asm
+++ b/tests/test_distort_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_envelope.asm b/tests/test_envelope.asm
index ebaced4..f24621d 100644
--- a/tests/test_envelope.asm
+++ b/tests/test_envelope.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm
index 810ab65..c0a8765 100644
--- a/tests/test_envelope_mod.asm
+++ b/tests/test_envelope_mod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,HLD, HLD, HLD, 0, 0, 0, 0, 0,
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_envelope_stereo.asm b/tests/test_envelope_stereo.asm
index 405b671..e29f055 100644
--- a/tests/test_envelope_stereo.asm
+++ b/tests/test_envelope_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -17,4 +17,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm
index fdf4636..f44fec1 100644
--- a/tests/test_filter_band.asm
+++ b/tests/test_filter_band.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm
index 66881e2..4a6a2a2 100644
--- a/tests/test_filter_freqmod.asm
+++ b/tests/test_filter_freqmod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_filter_high.asm b/tests/test_filter_high.asm
index fbd016a..136e210 100644
--- a/tests/test_filter_high.asm
+++ b/tests/test_filter_high.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm
index 96c5070..837d1aa 100644
--- a/tests/test_filter_low.asm
+++ b/tests/test_filter_low.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm
index 1dfcc83..4376e04 100644
--- a/tests/test_filter_peak.asm
+++ b/tests/test_filter_peak.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm
index cd086b7..aadb1c6 100644
--- a/tests/test_filter_resmod.asm
+++ b/tests/test_filter_resmod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_filter_stereo.asm b/tests/test_filter_stereo.asm
index 1757615..c8b0338 100644
--- a/tests/test_filter_stereo.asm
+++ b/tests/test_filter_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_gain.asm b/tests/test_gain.asm
index d3102ad..4915473 100644
--- a/tests/test_gain.asm
+++ b/tests/test_gain.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_gain_stereo.asm b/tests/test_gain_stereo.asm
index 1adb09a..1879aba 100644
--- a/tests/test_gain_stereo.asm
+++ b/tests/test_gain_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_hold.asm b/tests/test_hold.asm
index ba3c707..a84634c 100644
--- a/tests/test_hold.asm
+++ b/tests/test_hold.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_hold_mod.asm b/tests/test_hold_mod.asm
index 31603c4..1bcb02d 100644
--- a/tests/test_hold_mod.asm
+++ b/tests/test_hold_mod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_hold_stereo.asm b/tests/test_hold_stereo.asm
index 2703e06..4e72ea6 100644
--- a/tests/test_hold_stereo.asm
+++ b/tests/test_hold_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_in.asm b/tests/test_in.asm
index 75233aa..982aaa9 100644
--- a/tests/test_in.asm
+++ b/tests/test_in.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_in_stereo.asm b/tests/test_in_stereo.asm
index 0b4aa78..56d5c58 100644
--- a/tests/test_in_stereo.asm
+++ b/tests/test_in_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_invgain.asm b/tests/test_invgain.asm
index bbbd931..1c273ee 100644
--- a/tests/test_invgain.asm
+++ b/tests/test_invgain.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_invgain_stereo.asm b/tests/test_invgain_stereo.asm
index 14c4888..e8750bf 100644
--- a/tests/test_invgain_stereo.asm
+++ b/tests/test_invgain_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_loadnote.asm b/tests/test_loadnote.asm
index f6184b4..f32dc7f 100644
--- a/tests/test_loadnote.asm
+++ b/tests/test_loadnote.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_loadnote_stereo.asm b/tests/test_loadnote_stereo.asm
index 8200db5..7cd808a 100644
--- a/tests/test_loadnote_stereo.asm
+++ b/tests/test_loadnote_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0
@@ -17,4 +17,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_loadval.asm b/tests/test_loadval.asm
index c572146..73d682e 100644
--- a/tests/test_loadval.asm
+++ b/tests/test_loadval.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_loadval_stereo.asm b/tests/test_loadval_stereo.asm
index 3004f05..6d7ed80 100644
--- a/tests/test_loadval_stereo.asm
+++ b/tests/test_loadval_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -17,4 +17,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_mul.asm b/tests/test_mul.asm
index 5b1dc91..afe7e66 100644
--- a/tests/test_mul.asm
+++ b/tests/test_mul.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_mul_stereo.asm b/tests/test_mul_stereo.asm
index 948df3c..14b0563 100644
--- a/tests/test_mul_stereo.asm
+++ b/tests/test_mul_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_mulp.asm b/tests/test_mulp.asm
index 9904c3c..aa55180 100644
--- a/tests/test_mulp.asm
+++ b/tests/test_mulp.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_mulp_stereo.asm b/tests/test_mulp_stereo.asm
index 96c9bef..b11b4bd 100644
--- a/tests/test_mulp_stereo.asm
+++ b/tests/test_mulp_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_multiple_instruments.asm b/tests/test_multiple_instruments.asm
index cd33b4e..ebe0107 100644
--- a/tests/test_multiple_instruments.asm
+++ b/tests/test_multiple_instruments.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD, 0,  0,  0,0,0,0,0,0,
@@ -25,4 +25,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_noise.asm b/tests/test_noise.asm
index 0dfa6d9..cf10259 100644
--- a/tests/test_noise.asm
+++ b/tests/test_noise.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_noise_stereo.asm b/tests/test_noise_stereo.asm
index 672ae17..0447a5b 100644
--- a/tests/test_noise_stereo.asm
+++ b/tests/test_noise_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_colormod.asm b/tests/test_oscillat_colormod.asm
index bf5689d..0145710 100644
--- a/tests/test_oscillat_colormod.asm
+++ b/tests/test_oscillat_colormod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_detunemod.asm b/tests/test_oscillat_detunemod.asm
index 54bf97b..1f75208 100644
--- a/tests/test_oscillat_detunemod.asm
+++ b/tests/test_oscillat_detunemod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_gainmod.asm b/tests/test_oscillat_gainmod.asm
index 520a00d..e7101fd 100644
--- a/tests/test_oscillat_gainmod.asm
+++ b/tests/test_oscillat_gainmod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm
index 3b8f46b..1b9defb 100644
--- a/tests/test_oscillat_gate.asm
+++ b/tests/test_oscillat_gate.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_lfo.asm b/tests/test_oscillat_lfo.asm
index 715e770..6e1ce73 100644
--- a/tests/test_oscillat_lfo.asm
+++ b/tests/test_oscillat_lfo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_phasemod.asm b/tests/test_oscillat_phasemod.asm
index 223c2a0..81e3ef4 100644
--- a/tests/test_oscillat_phasemod.asm
+++ b/tests/test_oscillat_phasemod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm
index 70914b1..9762ea1 100644
--- a/tests/test_oscillat_pulse.asm
+++ b/tests/test_oscillat_pulse.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_sample.asm b/tests/test_oscillat_sample.asm
index 436a75f..e5e05ac 100644
--- a/tests/test_oscillat_sample.asm
+++ b/tests/test_oscillat_sample.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 0,0,0,0,0,0,0,0,
@@ -39,4 +39,4 @@ BEGIN_SAMPLE_OFFSETS
     SAMPLE_OFFSET START(1680142),LOOPSTART(1483),LOOPLENGTH(95) ; name VIOLN70, unitynote 58 (transpose to 2), data length 1579
 END_SAMPLE_OFFSETS
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_sample_stereo.asm b/tests/test_oscillat_sample_stereo.asm
index 7dd5a40..6c66804 100644
--- a/tests/test_oscillat_sample_stereo.asm
+++ b/tests/test_oscillat_sample_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 0,0,0,0,0,0,0,0,
@@ -36,4 +36,4 @@ BEGIN_SAMPLE_OFFSETS
     SAMPLE_OFFSET START(1678611),LOOPSTART(1341),LOOPLENGTH(106) ; name VIOLN68, unitynote 56 (transpose to 4), data length 1448    
 END_SAMPLE_OFFSETS
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_shapemod.asm b/tests/test_oscillat_shapemod.asm
index d21d4fa..218163d 100644
--- a/tests/test_oscillat_shapemod.asm
+++ b/tests/test_oscillat_shapemod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm
index 40f2c72..82e03c5 100644
--- a/tests/test_oscillat_sine.asm
+++ b/tests/test_oscillat_sine.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_stereo.asm b/tests/test_oscillat_stereo.asm
index eac9e82..689f8c4 100644
--- a/tests/test_oscillat_stereo.asm
+++ b/tests/test_oscillat_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_transposemod.asm b/tests/test_oscillat_transposemod.asm
index 272abcb..f7e8b14 100644
--- a/tests/test_oscillat_transposemod.asm
+++ b/tests/test_oscillat_transposemod.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm
index f17c3e5..c47b2d6 100644
--- a/tests/test_oscillat_trisaw.asm
+++ b/tests/test_oscillat_trisaw.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_unison.asm b/tests/test_oscillat_unison.asm
index 0e149a0..40bc445 100644
--- a/tests/test_oscillat_unison.asm
+++ b/tests/test_oscillat_unison.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_oscillat_unison_stereo.asm b/tests/test_oscillat_unison_stereo.asm
index 9450c4b..a325aad 100644
--- a/tests/test_oscillat_unison_stereo.asm
+++ b/tests/test_oscillat_unison_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, 0, 68, 0, 32, 0, 0, 0,  75, 0, 78, 0,   0, 0, 0, 0,
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_outaux.asm b/tests/test_outaux.asm
index 535cfdc..0079321 100644
--- a/tests/test_outaux.asm
+++ b/tests/test_outaux.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_outaux_stereo.asm b/tests/test_outaux_stereo.asm
index cf5ce4c..41681d0 100644
--- a/tests/test_outaux_stereo.asm
+++ b/tests/test_outaux_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_panning.asm b/tests/test_panning.asm
index 9bde0e8..ec65e5d 100644
--- a/tests/test_panning.asm
+++ b/tests/test_panning.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_panning_stereo.asm b/tests/test_panning_stereo.asm
index a47be20..97a6c70 100644
--- a/tests/test_panning_stereo.asm
+++ b/tests/test_panning_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_polyphony.asm b/tests/test_polyphony.asm
index 32d78d0..bafe369 100644
--- a/tests/test_polyphony.asm
+++ b/tests/test_polyphony.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, 68, HLD, 32, HLD, HLD, HLD,    75, HLD, 78, HLD,   HLD, 0, 0, 0,
@@ -29,4 +29,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_pop.asm b/tests/test_pop.asm
index d872c37..d5d5f4d 100644
--- a/tests/test_pop.asm
+++ b/tests/test_pop.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_pop_stereo.asm b/tests/test_pop_stereo.asm
index b9e3bef..ff0ae7a 100644
--- a/tests/test_pop_stereo.asm
+++ b/tests/test_pop_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_push.asm b/tests/test_push.asm
index 07bff2d..4ea4012 100644
--- a/tests/test_push.asm
+++ b/tests/test_push.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_push_stereo.asm b/tests/test_push_stereo.asm
index 4df4c98..8a657af 100644
--- a/tests/test_push_stereo.asm
+++ b/tests/test_push_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_receive.asm b/tests/test_receive.asm
index 3cbb62d..9798388 100644
--- a/tests/test_receive.asm
+++ b/tests/test_receive.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0      
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_receive_stereo.asm b/tests/test_receive_stereo.asm
index 3cfef03..9329020 100644
--- a/tests/test_receive_stereo.asm
+++ b/tests/test_receive_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0      
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_render_samples.c b/tests/test_render_samples.c
index 2f31c28..ed32ae9 100644
--- a/tests/test_render_samples.c
+++ b/tests/test_render_samples.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sointu.h"
+#include <sointu/sointu.h>
 
 #if UINTPTR_MAX == 0xffffffff // are we 32-bit?
 #if defined(__clang__) || defined(__GNUC__)
diff --git a/tests/test_render_samples_api.c b/tests/test_render_samples_api.c
index 86658f7..9a5f382 100644
--- a/tests/test_render_samples_api.c
+++ b/tests/test_render_samples_api.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <sointu.h>
+#include <sointu/sointu.h>
 
 #define BPM 100
 #define SAMPLE_RATE 44100
diff --git a/tests/test_send.asm b/tests/test_send.asm
index 802c1f4..49378a9 100644
--- a/tests/test_send.asm
+++ b/tests/test_send.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0      
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_send_global.asm b/tests/test_send_global.asm
index 9c0c23d..e04fdde 100644
--- a/tests/test_send_global.asm
+++ b/tests/test_send_global.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -27,4 +27,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_send_stereo.asm b/tests/test_send_stereo.asm
index fc89f25..1ae0495 100644
--- a/tests/test_send_stereo.asm
+++ b/tests/test_send_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0      
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_speed.asm b/tests/test_speed.asm
index 910b50d..5f88c60 100644
--- a/tests/test_speed.asm
+++ b/tests/test_speed.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 ; warning: crashes ahead. Now that the bpm could be changed and even modulated by other
 ; signals, there is no easy way to figure out how many ticks your song is. Either
@@ -33,4 +33,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_xch.asm b/tests/test_xch.asm
index 44905ea..c8803c4 100644
--- a/tests/test_xch.asm
+++ b/tests/test_xch.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"
diff --git a/tests/test_xch_stereo.asm b/tests/test_xch_stereo.asm
index e2ca928..b835845 100644
--- a/tests/test_xch_stereo.asm
+++ b/tests/test_xch_stereo.asm
@@ -1,6 +1,6 @@
 %define BPM 100
 
-%include "sointu_header.inc"
+%include "sointu/header.inc"
 
 BEGIN_PATTERNS
     PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,  0, 0, 0, 0, 0, 0, 0, 0
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu_footer.inc"
+%include "sointu/footer.inc"