diff --git a/host/END.s b/host/src/END.s
similarity index 100%
rename from host/END.s
rename to host/src/END.s
diff --git a/host/STARTUP.s b/host/src/STARTUP.s
similarity index 100%
rename from host/STARTUP.s
rename to host/src/STARTUP.s
diff --git a/host/dubbel_buffer/raster_irqs.s b/host/src/dubbel_buffer/raster_irqs.s
similarity index 100%
rename from host/dubbel_buffer/raster_irqs.s
rename to host/src/dubbel_buffer/raster_irqs.s
diff --git a/host/loader.s b/host/src/loader.s
similarity index 100%
rename from host/loader.s
rename to host/src/loader.s
diff --git a/host/lookup_tables.s b/host/src/lookup_tables.s
similarity index 100%
rename from host/lookup_tables.s
rename to host/src/lookup_tables.s
diff --git a/host/macros/16aritmatic.s b/host/src/macros/16aritmatic.s
similarity index 100%
rename from host/macros/16aritmatic.s
rename to host/src/macros/16aritmatic.s
diff --git a/host/macros/timer.s b/host/src/macros/timer.s
similarity index 100%
rename from host/macros/timer.s
rename to host/src/macros/timer.s
diff --git a/host/mainloop.s b/host/src/mainloop.s
similarity index 100%
rename from host/mainloop.s
rename to host/src/mainloop.s
diff --git a/host/public.inc b/host/src/public.inc
similarity index 100%
rename from host/public.inc
rename to host/src/public.inc
diff --git a/host/routines/arithmatic/arithmatic.inc b/host/src/routines/arithmatic/arithmatic.inc
similarity index 100%
rename from host/routines/arithmatic/arithmatic.inc
rename to host/src/routines/arithmatic/arithmatic.inc
diff --git a/host/routines/arithmatic/div.s b/host/src/routines/arithmatic/div.s
similarity index 100%
rename from host/routines/arithmatic/div.s
rename to host/src/routines/arithmatic/div.s
diff --git a/host/routines/arithmatic/div_test.s b/host/src/routines/arithmatic/div_test.s
similarity index 100%
rename from host/routines/arithmatic/div_test.s
rename to host/src/routines/arithmatic/div_test.s
diff --git a/host/routines/arithmatic/mult.s b/host/src/routines/arithmatic/mult.s
similarity index 100%
rename from host/routines/arithmatic/mult.s
rename to host/src/routines/arithmatic/mult.s
diff --git a/host/routines/arithmatic/mult_test.s b/host/src/routines/arithmatic/mult_test.s
similarity index 100%
rename from host/routines/arithmatic/mult_test.s
rename to host/src/routines/arithmatic/mult_test.s
diff --git a/host/routines/circle/circle.inc b/host/src/routines/circle/circle.inc
similarity index 100%
rename from host/routines/circle/circle.inc
rename to host/src/routines/circle/circle.inc
diff --git a/host/routines/circle/circle.s b/host/src/routines/circle/circle.s
similarity index 100%
rename from host/routines/circle/circle.s
rename to host/src/routines/circle/circle.s
diff --git a/host/routines/circle/circle_test.s b/host/src/routines/circle/circle_test.s
similarity index 100%
rename from host/routines/circle/circle_test.s
rename to host/src/routines/circle/circle_test.s
diff --git a/host/routines/circle/circle_test_position.s b/host/src/routines/circle/circle_test_position.s
similarity index 100%
rename from host/routines/circle/circle_test_position.s
rename to host/src/routines/circle/circle_test_position.s
diff --git a/host/routines/circle/circle_test_size.s b/host/src/routines/circle/circle_test_size.s
similarity index 100%
rename from host/routines/circle/circle_test_size.s
rename to host/src/routines/circle/circle_test_size.s
diff --git a/host/routines/line/line.inc b/host/src/routines/line/line.inc
similarity index 100%
rename from host/routines/line/line.inc
rename to host/src/routines/line/line.inc
diff --git a/host/routines/line/line.s b/host/src/routines/line/line.s
similarity index 100%
rename from host/routines/line/line.s
rename to host/src/routines/line/line.s
diff --git a/host/routines/line/line_down.s b/host/src/routines/line/line_down.s
similarity index 100%
rename from host/routines/line/line_down.s
rename to host/src/routines/line/line_down.s
diff --git a/host/routines/line/line_down_inv.s b/host/src/routines/line/line_down_inv.s
similarity index 100%
rename from host/routines/line/line_down_inv.s
rename to host/src/routines/line/line_down_inv.s
diff --git a/host/routines/line/line_test.s b/host/src/routines/line/line_test.s
similarity index 100%
rename from host/routines/line/line_test.s
rename to host/src/routines/line/line_test.s
diff --git a/host/routines/line/line_test_extensive.s b/host/src/routines/line/line_test_extensive.s
similarity index 100%
rename from host/routines/line/line_test_extensive.s
rename to host/src/routines/line/line_test_extensive.s
diff --git a/host/routines/line/line_up.s b/host/src/routines/line/line_up.s
similarity index 100%
rename from host/routines/line/line_up.s
rename to host/src/routines/line/line_up.s
diff --git a/host/routines/line/line_up_inv.s b/host/src/routines/line/line_up_inv.s
similarity index 100%
rename from host/routines/line/line_up_inv.s
rename to host/src/routines/line/line_up_inv.s
diff --git a/host/routines/memory/mem.inc b/host/src/routines/memory/mem.inc
similarity index 100%
rename from host/routines/memory/mem.inc
rename to host/src/routines/memory/mem.inc
diff --git a/host/routines/memory/memcpy.s b/host/src/routines/memory/memcpy.s
similarity index 100%
rename from host/routines/memory/memcpy.s
rename to host/src/routines/memory/memcpy.s
diff --git a/host/routines/memory/memcpy_test.s b/host/src/routines/memory/memcpy_test.s
similarity index 100%
rename from host/routines/memory/memcpy_test.s
rename to host/src/routines/memory/memcpy_test.s
diff --git a/host/routines/memory/memset.s b/host/src/routines/memory/memset.s
similarity index 100%
rename from host/routines/memory/memset.s
rename to host/src/routines/memory/memset.s
diff --git a/host/routines/memory/memset_alt.s b/host/src/routines/memory/memset_alt.s
similarity index 100%
rename from host/routines/memory/memset_alt.s
rename to host/src/routines/memory/memset_alt.s
diff --git a/host/routines/memory/memset_test.s b/host/src/routines/memory/memset_test.s
similarity index 100%
rename from host/routines/memory/memset_test.s
rename to host/src/routines/memory/memset_test.s
diff --git a/host/routines/pixel/pixel.inc b/host/src/routines/pixel/pixel.inc
similarity index 100%
rename from host/routines/pixel/pixel.inc
rename to host/src/routines/pixel/pixel.inc
diff --git a/host/routines/pixel/pixel_calc.s b/host/src/routines/pixel/pixel_calc.s
similarity index 100%
rename from host/routines/pixel/pixel_calc.s
rename to host/src/routines/pixel/pixel_calc.s
diff --git a/host/routines/pixel/pixel_draw.s b/host/src/routines/pixel/pixel_draw.s
similarity index 100%
rename from host/routines/pixel/pixel_draw.s
rename to host/src/routines/pixel/pixel_draw.s
diff --git a/host/routines/pixel/pixel_test.s b/host/src/routines/pixel/pixel_test.s
similarity index 100%
rename from host/routines/pixel/pixel_test.s
rename to host/src/routines/pixel/pixel_test.s
diff --git a/host/routines/text/char.inc b/host/src/routines/text/char.inc
similarity index 100%
rename from host/routines/text/char.inc
rename to host/src/routines/text/char.inc
diff --git a/host/routines/text/char_draw.s b/host/src/routines/text/char_draw.s
similarity index 100%
rename from host/routines/text/char_draw.s
rename to host/src/routines/text/char_draw.s
diff --git a/host/routines/text/char_draw_test.s b/host/src/routines/text/char_draw_test.s
similarity index 100%
rename from host/routines/text/char_draw_test.s
rename to host/src/routines/text/char_draw_test.s
diff --git a/host/routines/triangle/lower_triangle.s b/host/src/routines/triangle/lower_triangle.s
similarity index 100%
rename from host/routines/triangle/lower_triangle.s
rename to host/src/routines/triangle/lower_triangle.s
diff --git a/host/routines/triangle/triangle.inc b/host/src/routines/triangle/triangle.inc
similarity index 100%
rename from host/routines/triangle/triangle.inc
rename to host/src/routines/triangle/triangle.inc
diff --git a/host/routines/triangle/triangle.s b/host/src/routines/triangle/triangle.s
similarity index 100%
rename from host/routines/triangle/triangle.s
rename to host/src/routines/triangle/triangle.s
diff --git a/host/routines/triangle/triangle_test.s b/host/src/routines/triangle/triangle_test.s
similarity index 100%
rename from host/routines/triangle/triangle_test.s
rename to host/src/routines/triangle/triangle_test.s
diff --git a/host/routines/triangle/upper_triangle.s b/host/src/routines/triangle/upper_triangle.s
similarity index 100%
rename from host/routines/triangle/upper_triangle.s
rename to host/src/routines/triangle/upper_triangle.s
diff --git a/host/source.s b/host/src/source.s
similarity index 98%
rename from host/source.s
rename to host/src/source.s
index 2627f68..0d63e58 100644
--- a/host/source.s
+++ b/host/src/source.s
@@ -48,7 +48,7 @@ JMP exit
 
 .ifdef EMULATOR_PREVIEW
 batch_userprog:
-.incbin "userprog.bin"
+.incbin "../userprog.bin"
 .endif
 
 .include "END.s"