From 3a86c5975b9500654dd3a64887f2792864bfaa10 Mon Sep 17 00:00:00 2001
From: Adam Greenwood-Byrne <adam@isometim.es>
Date: Thu, 25 Mar 2021 09:20:48 +0000
Subject: [PATCH] Restructured the codebase for a bit more clarity

---
 part12-wgt/Makefile                      | 4 ++--
 part12-wgt/{ => include}/wgt.h           | 2 +-
 part12-wgt/{ => include}/wgtspr.h        | 0
 part12-wgt/{examples => samples}/wgt01.c | 2 +-
 part12-wgt/{examples => samples}/wgt02.c | 2 +-
 part12-wgt/{examples => samples}/wgt03.c | 2 +-
 part12-wgt/{examples => samples}/wgt04.c | 2 +-
 part12-wgt/{examples => samples}/wgt07.c | 2 +-
 part12-wgt/{examples => samples}/wgt08.c | 2 +-
 part12-wgt/{examples => samples}/wgt09.c | 2 +-
 part12-wgt/{examples => samples}/wgt10.c | 2 +-
 part12-wgt/{examples => samples}/wgt11.c | 2 +-
 part12-wgt/{examples => samples}/wgt17.c | 2 +-
 part12-wgt/{examples => samples}/wgt18.c | 2 +-
 part12-wgt/{examples => samples}/wgt19.c | 2 +-
 part12-wgt/{examples => samples}/wgt20.c | 2 +-
 part12-wgt/{examples => samples}/wgt21.c | 2 +-
 part12-wgt/{examples => samples}/wgt22.c | 2 +-
 part12-wgt/{examples => samples}/wgt24.c | 2 +-
 part12-wgt/{examples => samples}/wgt25.c | 2 +-
 part12-wgt/{examples => samples}/wgt27.c | 2 +-
 part12-wgt/{examples => samples}/wgt29.c | 2 +-
 part12-wgt/{examples => samples}/wgt32.c | 2 +-
 part12-wgt/{examples => samples}/wgt33.c | 2 +-
 part12-wgt/{examples => samples}/wgt45.c | 2 +-
 part12-wgt/{examples => samples}/wgt46.c | 2 +-
 part12-wgt/{examples => samples}/wgt60.c | 2 +-
 part12-wgt/{ => wgt}/fill.c              | 4 ++--
 part12-wgt/{ => wgt}/font.c              | 0
 part12-wgt/{ => wgt}/loadspr.c           | 4 ++--
 part12-wgt/{ => wgt}/mouse.c             | 8 ++++----
 part12-wgt/{ => wgt}/nline.c             | 2 +-
 part12-wgt/{ => wgt}/wbezier.c           | 4 ++--
 part12-wgt/{ => wgt}/wblock.c            | 4 ++--
 part12-wgt/{ => wgt}/wbox.c              | 2 +-
 part12-wgt/{ => wgt}/wbutt.c             | 2 +-
 part12-wgt/{ => wgt}/wcircle.c           | 2 +-
 part12-wgt/{ => wgt}/wclip.c             | 2 +-
 part12-wgt/{ => wgt}/wdissolve.c         | 2 +-
 part12-wgt/{ => wgt}/wellipse.c          | 2 +-
 part12-wgt/{ => wgt}/wflipb.c            | 4 ++--
 part12-wgt/{ => wgt}/wgt.c               | 2 +-
 part12-wgt/{ => wgt}/winitply.c          | 4 ++--
 part12-wgt/{ => wgt}/wline.c             | 2 +-
 part12-wgt/{ => wgt}/wmiscb.c            | 4 ++--
 part12-wgt/{ => wgt}/wnpblock.c          | 4 ++--
 part12-wgt/{ => wgt}/wpal.c              | 2 +-
 part12-wgt/{ => wgt}/wpixel.c            | 2 +-
 part12-wgt/{ => wgt}/wresize.c           | 2 +-
 part12-wgt/{ => wgt}/wscreen.c           | 2 +-
 part12-wgt/{ => wgt}/wsetcol.c           | 2 +-
 part12-wgt/{ => wgt}/wsetmode.c          | 2 +-
 part12-wgt/{ => wgt}/wskew.c             | 2 +-
 part12-wgt/{ => wgt}/wspoly.c            | 2 +-
 part12-wgt/{ => wgt}/wspr.c              | 2 +-
 part12-wgt/{ => wgt}/wtext.c             | 2 +-
 part12-wgt/{ => wgt}/wticker.c           | 4 ++--
 part12-wgt/{ => wgt}/wvertres.c          | 2 +-
 part12-wgt/{ => wgt}/wwarp.c             | 2 +-
 part12-wgt/{ => wgt}/wwipe.c             | 2 +-
 60 files changed, 71 insertions(+), 71 deletions(-)
 rename part12-wgt/{ => include}/wgt.h (99%)
 rename part12-wgt/{ => include}/wgtspr.h (100%)
 rename part12-wgt/{examples => samples}/wgt01.c (90%)
 rename part12-wgt/{examples => samples}/wgt02.c (98%)
 rename part12-wgt/{examples => samples}/wgt03.c (99%)
 rename part12-wgt/{examples => samples}/wgt04.c (99%)
 rename part12-wgt/{examples => samples}/wgt07.c (98%)
 rename part12-wgt/{examples => samples}/wgt08.c (98%)
 rename part12-wgt/{examples => samples}/wgt09.c (98%)
 rename part12-wgt/{examples => samples}/wgt10.c (98%)
 rename part12-wgt/{examples => samples}/wgt11.c (98%)
 rename part12-wgt/{examples => samples}/wgt17.c (96%)
 rename part12-wgt/{examples => samples}/wgt18.c (98%)
 rename part12-wgt/{examples => samples}/wgt19.c (98%)
 rename part12-wgt/{examples => samples}/wgt20.c (99%)
 rename part12-wgt/{examples => samples}/wgt21.c (98%)
 rename part12-wgt/{examples => samples}/wgt22.c (99%)
 rename part12-wgt/{examples => samples}/wgt24.c (99%)
 rename part12-wgt/{examples => samples}/wgt25.c (99%)
 rename part12-wgt/{examples => samples}/wgt27.c (98%)
 rename part12-wgt/{examples => samples}/wgt29.c (98%)
 rename part12-wgt/{examples => samples}/wgt32.c (99%)
 rename part12-wgt/{examples => samples}/wgt33.c (98%)
 rename part12-wgt/{examples => samples}/wgt45.c (98%)
 rename part12-wgt/{examples => samples}/wgt46.c (98%)
 rename part12-wgt/{examples => samples}/wgt60.c (99%)
 rename part12-wgt/{ => wgt}/fill.c (98%)
 rename part12-wgt/{ => wgt}/font.c (100%)
 rename part12-wgt/{ => wgt}/loadspr.c (93%)
 rename part12-wgt/{ => wgt}/mouse.c (98%)
 rename part12-wgt/{ => wgt}/nline.c (99%)
 rename part12-wgt/{ => wgt}/wbezier.c (95%)
 rename part12-wgt/{ => wgt}/wblock.c (87%)
 rename part12-wgt/{ => wgt}/wbox.c (97%)
 rename part12-wgt/{ => wgt}/wbutt.c (96%)
 rename part12-wgt/{ => wgt}/wcircle.c (98%)
 rename part12-wgt/{ => wgt}/wclip.c (94%)
 rename part12-wgt/{ => wgt}/wdissolve.c (96%)
 rename part12-wgt/{ => wgt}/wellipse.c (98%)
 rename part12-wgt/{ => wgt}/wflipb.c (96%)
 rename part12-wgt/{ => wgt}/wgt.c (98%)
 rename part12-wgt/{ => wgt}/winitply.c (92%)
 rename part12-wgt/{ => wgt}/wline.c (98%)
 rename part12-wgt/{ => wgt}/wmiscb.c (85%)
 rename part12-wgt/{ => wgt}/wnpblock.c (97%)
 rename part12-wgt/{ => wgt}/wpal.c (99%)
 rename part12-wgt/{ => wgt}/wpixel.c (91%)
 rename part12-wgt/{ => wgt}/wresize.c (99%)
 rename part12-wgt/{ => wgt}/wscreen.c (98%)
 rename part12-wgt/{ => wgt}/wsetcol.c (97%)
 rename part12-wgt/{ => wgt}/wsetmode.c (98%)
 rename part12-wgt/{ => wgt}/wskew.c (96%)
 rename part12-wgt/{ => wgt}/wspoly.c (98%)
 rename part12-wgt/{ => wgt}/wspr.c (99%)
 rename part12-wgt/{ => wgt}/wtext.c (99%)
 rename part12-wgt/{ => wgt}/wticker.c (94%)
 rename part12-wgt/{ => wgt}/wvertres.c (97%)
 rename part12-wgt/{ => wgt}/wwarp.c (98%)
 rename part12-wgt/{ => wgt}/wwipe.c (97%)

diff --git a/part12-wgt/Makefile b/part12-wgt/Makefile
index b8af9fd..4e67357 100644
--- a/part12-wgt/Makefile
+++ b/part12-wgt/Makefile
@@ -1,4 +1,4 @@
-CFILES = $(wildcard *.c lib/*.c)
+CFILES = $(wildcard *.c lib/*.c wgt/*.c)
 OFILES = $(CFILES:.c=.o)
 LLVMPATH = /opt/homebrew/opt/llvm/bin
 CLANGFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -mcpu=cortex-a72+nosimd
@@ -43,4 +43,4 @@ kernel8.img: boot/boot.o $(OFILES) bin/BCM4345C0.o bin/wgt1pal.o bin/wgt1blk.o b
 	$(LLVMPATH)/llvm-objcopy -O binary kernel8.elf kernel8.img
 
 clean:
-	/bin/rm kernel8.elf *.o bin/*.o boot/*.o lib/*.o *.img > /dev/null 2> /dev/null || true
+	/bin/rm kernel8.elf *.o bin/*.o boot/*.o lib/*.o wgt/*.o *.img > /dev/null 2> /dev/null || true
diff --git a/part12-wgt/wgt.h b/part12-wgt/include/wgt.h
similarity index 99%
rename from part12-wgt/wgt.h
rename to part12-wgt/include/wgt.h
index 52f3ccd..4a2ff05 100644
--- a/part12-wgt/wgt.h
+++ b/part12-wgt/include/wgt.h
@@ -1,4 +1,4 @@
-#include "include/mb.h"
+#include "mb.h"
 
 #define NULL 0
 #define rgb(r,g,b) (r<<16)|(g<<8)|b
diff --git a/part12-wgt/wgtspr.h b/part12-wgt/include/wgtspr.h
similarity index 100%
rename from part12-wgt/wgtspr.h
rename to part12-wgt/include/wgtspr.h
diff --git a/part12-wgt/examples/wgt01.c b/part12-wgt/samples/wgt01.c
similarity index 90%
rename from part12-wgt/examples/wgt01.c
rename to part12-wgt/samples/wgt01.c
index 32c7113..77553cd 100644
--- a/part12-wgt/examples/wgt01.c
+++ b/part12-wgt/samples/wgt01.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 
 // ######## WGT EXAMPLES ########
 
diff --git a/part12-wgt/examples/wgt02.c b/part12-wgt/samples/wgt02.c
similarity index 98%
rename from part12-wgt/examples/wgt02.c
rename to part12-wgt/samples/wgt02.c
index 4ab17e3..b7d5d13 100644
--- a/part12-wgt/examples/wgt02.c
+++ b/part12-wgt/samples/wgt02.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 
 // ######## REQUIRED FUNCTIONS ########
 
diff --git a/part12-wgt/examples/wgt03.c b/part12-wgt/samples/wgt03.c
similarity index 99%
rename from part12-wgt/examples/wgt03.c
rename to part12-wgt/samples/wgt03.c
index dfc5532..6968c7e 100644
--- a/part12-wgt/examples/wgt03.c
+++ b/part12-wgt/samples/wgt03.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mb.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt04.c b/part12-wgt/samples/wgt04.c
similarity index 99%
rename from part12-wgt/examples/wgt04.c
rename to part12-wgt/samples/wgt04.c
index 9dfaa18..25a4edc 100644
--- a/part12-wgt/examples/wgt04.c
+++ b/part12-wgt/samples/wgt04.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 
 #define MAX_RADIUS 100
 
diff --git a/part12-wgt/examples/wgt07.c b/part12-wgt/samples/wgt07.c
similarity index 98%
rename from part12-wgt/examples/wgt07.c
rename to part12-wgt/samples/wgt07.c
index 6b899e0..7893a46 100644
--- a/part12-wgt/examples/wgt07.c
+++ b/part12-wgt/samples/wgt07.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 
 // ######## REQUIRED FUNCTIONS ########
 
diff --git a/part12-wgt/examples/wgt08.c b/part12-wgt/samples/wgt08.c
similarity index 98%
rename from part12-wgt/examples/wgt08.c
rename to part12-wgt/samples/wgt08.c
index dd7c4d9..a2e6971 100644
--- a/part12-wgt/examples/wgt08.c
+++ b/part12-wgt/samples/wgt08.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt09.c b/part12-wgt/samples/wgt09.c
similarity index 98%
rename from part12-wgt/examples/wgt09.c
rename to part12-wgt/samples/wgt09.c
index 7025e89..05e0887 100644
--- a/part12-wgt/examples/wgt09.c
+++ b/part12-wgt/samples/wgt09.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 #include "include/mb.h"
 
diff --git a/part12-wgt/examples/wgt10.c b/part12-wgt/samples/wgt10.c
similarity index 98%
rename from part12-wgt/examples/wgt10.c
rename to part12-wgt/samples/wgt10.c
index 93e84c6..467c4fe 100644
--- a/part12-wgt/examples/wgt10.c
+++ b/part12-wgt/samples/wgt10.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 #include "include/mb.h"
 
diff --git a/part12-wgt/examples/wgt11.c b/part12-wgt/samples/wgt11.c
similarity index 98%
rename from part12-wgt/examples/wgt11.c
rename to part12-wgt/samples/wgt11.c
index 4dc2ef8..37e6ef7 100644
--- a/part12-wgt/examples/wgt11.c
+++ b/part12-wgt/samples/wgt11.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 #include "include/mb.h"
 
diff --git a/part12-wgt/examples/wgt17.c b/part12-wgt/samples/wgt17.c
similarity index 96%
rename from part12-wgt/examples/wgt17.c
rename to part12-wgt/samples/wgt17.c
index 5fffef7..338493a 100644
--- a/part12-wgt/examples/wgt17.c
+++ b/part12-wgt/samples/wgt17.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt18.c b/part12-wgt/samples/wgt18.c
similarity index 98%
rename from part12-wgt/examples/wgt18.c
rename to part12-wgt/samples/wgt18.c
index 4dc53d9..07a11f0 100644
--- a/part12-wgt/examples/wgt18.c
+++ b/part12-wgt/samples/wgt18.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 
diff --git a/part12-wgt/examples/wgt19.c b/part12-wgt/samples/wgt19.c
similarity index 98%
rename from part12-wgt/examples/wgt19.c
rename to part12-wgt/samples/wgt19.c
index f0a6c71..8c2f3be 100644
--- a/part12-wgt/examples/wgt19.c
+++ b/part12-wgt/samples/wgt19.c
@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 
diff --git a/part12-wgt/examples/wgt20.c b/part12-wgt/samples/wgt20.c
similarity index 99%
rename from part12-wgt/examples/wgt20.c
rename to part12-wgt/samples/wgt20.c
index 6da5ad7..fde4bf6 100644
--- a/part12-wgt/examples/wgt20.c
+++ b/part12-wgt/samples/wgt20.c
@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 
diff --git a/part12-wgt/examples/wgt21.c b/part12-wgt/samples/wgt21.c
similarity index 98%
rename from part12-wgt/examples/wgt21.c
rename to part12-wgt/samples/wgt21.c
index 7827c7b..93c4b42 100644
--- a/part12-wgt/examples/wgt21.c
+++ b/part12-wgt/samples/wgt21.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt22.c b/part12-wgt/samples/wgt22.c
similarity index 99%
rename from part12-wgt/examples/wgt22.c
rename to part12-wgt/samples/wgt22.c
index 8ff5b56..069594f 100644
--- a/part12-wgt/examples/wgt22.c
+++ b/part12-wgt/samples/wgt22.c
@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 
diff --git a/part12-wgt/examples/wgt24.c b/part12-wgt/samples/wgt24.c
similarity index 99%
rename from part12-wgt/examples/wgt24.c
rename to part12-wgt/samples/wgt24.c
index 0639474..1f6e051 100644
--- a/part12-wgt/examples/wgt24.c
+++ b/part12-wgt/samples/wgt24.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt25.c b/part12-wgt/samples/wgt25.c
similarity index 99%
rename from part12-wgt/examples/wgt25.c
rename to part12-wgt/samples/wgt25.c
index feb5fd0..7b069a1 100644
--- a/part12-wgt/examples/wgt25.c
+++ b/part12-wgt/samples/wgt25.c
@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt27.c b/part12-wgt/samples/wgt27.c
similarity index 98%
rename from part12-wgt/examples/wgt27.c
rename to part12-wgt/samples/wgt27.c
index e25baf4..872a1bf 100644
--- a/part12-wgt/examples/wgt27.c
+++ b/part12-wgt/samples/wgt27.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt29.c b/part12-wgt/samples/wgt29.c
similarity index 98%
rename from part12-wgt/examples/wgt29.c
rename to part12-wgt/samples/wgt29.c
index 92e16a5..e6f8814 100644
--- a/part12-wgt/examples/wgt29.c
+++ b/part12-wgt/samples/wgt29.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt32.c b/part12-wgt/samples/wgt32.c
similarity index 99%
rename from part12-wgt/examples/wgt32.c
rename to part12-wgt/samples/wgt32.c
index b377a90..714cb4d 100644
--- a/part12-wgt/examples/wgt32.c
+++ b/part12-wgt/samples/wgt32.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt33.c b/part12-wgt/samples/wgt33.c
similarity index 98%
rename from part12-wgt/examples/wgt33.c
rename to part12-wgt/samples/wgt33.c
index 38a5987..56b737a 100644
--- a/part12-wgt/examples/wgt33.c
+++ b/part12-wgt/samples/wgt33.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt45.c b/part12-wgt/samples/wgt45.c
similarity index 98%
rename from part12-wgt/examples/wgt45.c
rename to part12-wgt/samples/wgt45.c
index 628bb78..e49fcdb 100644
--- a/part12-wgt/examples/wgt45.c
+++ b/part12-wgt/samples/wgt45.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt46.c b/part12-wgt/samples/wgt46.c
similarity index 98%
rename from part12-wgt/examples/wgt46.c
rename to part12-wgt/samples/wgt46.c
index 15d46f7..f45d924 100644
--- a/part12-wgt/examples/wgt46.c
+++ b/part12-wgt/samples/wgt46.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########
diff --git a/part12-wgt/examples/wgt60.c b/part12-wgt/samples/wgt60.c
similarity index 99%
rename from part12-wgt/examples/wgt60.c
rename to part12-wgt/samples/wgt60.c
index 766dc72..55a0fd2 100644
--- a/part12-wgt/examples/wgt60.c
+++ b/part12-wgt/samples/wgt60.c
@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 
diff --git a/part12-wgt/fill.c b/part12-wgt/wgt/fill.c
similarity index 98%
rename from part12-wgt/fill.c
rename to part12-wgt/wgt/fill.c
index 48f1202..20409ea 100644
--- a/part12-wgt/fill.c
+++ b/part12-wgt/wgt/fill.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/mem.h"
+#include "../include/wgt.h"
+#include "../include/mem.h"
 
 static short start, end;            /* Start and end x coords for filled line */
 
diff --git a/part12-wgt/font.c b/part12-wgt/wgt/font.c
similarity index 100%
rename from part12-wgt/font.c
rename to part12-wgt/wgt/font.c
diff --git a/part12-wgt/loadspr.c b/part12-wgt/wgt/loadspr.c
similarity index 93%
rename from part12-wgt/loadspr.c
rename to part12-wgt/wgt/loadspr.c
index 46bd29e..f74bf56 100644
--- a/part12-wgt/loadspr.c
+++ b/part12-wgt/wgt/loadspr.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/mem.h"
+#include "../include/wgt.h"
+#include "../include/mem.h"
 
 short wloadsprites (color *pal, unsigned char *file, block *image_array, short start,
 		    short end)
diff --git a/part12-wgt/mouse.c b/part12-wgt/wgt/mouse.c
similarity index 98%
rename from part12-wgt/mouse.c
rename to part12-wgt/wgt/mouse.c
index 14aa83b..dc874d3 100644
--- a/part12-wgt/mouse.c
+++ b/part12-wgt/wgt/mouse.c
@@ -1,7 +1,7 @@
-#include "wgt.h"
-#include "include/multicore.h"
-#include "include/io.h"
-#include "include/bt.h"
+#include "../include/wgt.h"
+#include "../include/multicore.h"
+#include "../include/io.h"
+#include "../include/bt.h"
 
 #define MAX_MSG_LEN    50
 #define MAX_READ_RUN   100
diff --git a/part12-wgt/nline.c b/part12-wgt/wgt/nline.c
similarity index 99%
rename from part12-wgt/nline.c
rename to part12-wgt/wgt/nline.c
index 7914c2d..8d61c87 100644
--- a/part12-wgt/nline.c
+++ b/part12-wgt/wgt/nline.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wfline (short x, short y, short x2, short y2)
 {
diff --git a/part12-wgt/wbezier.c b/part12-wgt/wgt/wbezier.c
similarity index 95%
rename from part12-wgt/wbezier.c
rename to part12-wgt/wgt/wbezier.c
index 79d6b39..6069424 100644
--- a/part12-wgt/wbezier.c
+++ b/part12-wgt/wgt/wbezier.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/mem.h"
+#include "../include/wgt.h"
+#include "../include/mem.h"
 
 void wbezier (tpolypoint *rawpts, short numraw, tpolypoint *curvepts, short numcurve)
 /* Bezier curve algorithm submitted to us by Claude Morais */
diff --git a/part12-wgt/wblock.c b/part12-wgt/wgt/wblock.c
similarity index 87%
rename from part12-wgt/wblock.c
rename to part12-wgt/wgt/wblock.c
index c384bbb..c542aa8 100644
--- a/part12-wgt/wblock.c
+++ b/part12-wgt/wgt/wblock.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/mem.h"
+#include "../include/wgt.h"
+#include "../include/mem.h"
 
 block wloadblock (unsigned char *data)
 {
diff --git a/part12-wgt/wbox.c b/part12-wgt/wgt/wbox.c
similarity index 97%
rename from part12-wgt/wbox.c
rename to part12-wgt/wgt/wbox.c
index 606d35f..1520dae 100644
--- a/part12-wgt/wbox.c
+++ b/part12-wgt/wgt/wbox.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wrectangle (short x, short y, short x2, short y2)
 {
diff --git a/part12-wgt/wbutt.c b/part12-wgt/wgt/wbutt.c
similarity index 96%
rename from part12-wgt/wbutt.c
rename to part12-wgt/wgt/wbutt.c
index 039a0b1..42a05ce 100644
--- a/part12-wgt/wbutt.c
+++ b/part12-wgt/wgt/wbutt.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wbutt (short x, short y, short x2, short y2)
 {
diff --git a/part12-wgt/wcircle.c b/part12-wgt/wgt/wcircle.c
similarity index 98%
rename from part12-wgt/wcircle.c
rename to part12-wgt/wgt/wcircle.c
index 0acdb89..9cbfd59 100644
--- a/part12-wgt/wcircle.c
+++ b/part12-wgt/wgt/wcircle.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 static void hplotcircle (short x, short y, short x_center, short y_center)
 {
diff --git a/part12-wgt/wclip.c b/part12-wgt/wgt/wclip.c
similarity index 94%
rename from part12-wgt/wclip.c
rename to part12-wgt/wgt/wclip.c
index 698a7e3..e76f6cc 100644
--- a/part12-wgt/wclip.c
+++ b/part12-wgt/wgt/wclip.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wclip (short x, short y, short x2, short y2)
 {
diff --git a/part12-wgt/wdissolve.c b/part12-wgt/wgt/wdissolve.c
similarity index 96%
rename from part12-wgt/wdissolve.c
rename to part12-wgt/wgt/wdissolve.c
index c83a67a..71bf722 100644
--- a/part12-wgt/wdissolve.c
+++ b/part12-wgt/wgt/wdissolve.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wdissolve (block sourceimage, short *pattern, short speed)
 {
diff --git a/part12-wgt/wellipse.c b/part12-wgt/wgt/wellipse.c
similarity index 98%
rename from part12-wgt/wellipse.c
rename to part12-wgt/wgt/wellipse.c
index 242d8c0..b36a7e6 100644
--- a/part12-wgt/wellipse.c
+++ b/part12-wgt/wgt/wellipse.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wellipse (short x_center, short y_center, short x_radius, short y_radius)
 {
diff --git a/part12-wgt/wflipb.c b/part12-wgt/wgt/wflipb.c
similarity index 96%
rename from part12-wgt/wflipb.c
rename to part12-wgt/wgt/wflipb.c
index 3d45960..76603aa 100644
--- a/part12-wgt/wflipb.c
+++ b/part12-wgt/wgt/wflipb.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/mem.h"
+#include "../include/wgt.h"
+#include "../include/mem.h"
 
 #define fastcopy memcpy
 
diff --git a/part12-wgt/wgt.c b/part12-wgt/wgt/wgt.c
similarity index 98%
rename from part12-wgt/wgt.c
rename to part12-wgt/wgt/wgt.c
index 778f193..3eb9502 100644
--- a/part12-wgt/wgt.c
+++ b/part12-wgt/wgt/wgt.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 block abuf;                              /* pointer to the active screen */
 block fbuf;                              /* pointer to the hardware framebuffer */
diff --git a/part12-wgt/winitply.c b/part12-wgt/wgt/winitply.c
similarity index 92%
rename from part12-wgt/winitply.c
rename to part12-wgt/wgt/winitply.c
index 24cde77..ba353c0 100644
--- a/part12-wgt/winitply.c
+++ b/part12-wgt/wgt/winitply.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/mem.h"
+#include "../include/wgt.h"
+#include "../include/mem.h"
 
 short *pinit_array;
 short *pstartx;
diff --git a/part12-wgt/wline.c b/part12-wgt/wgt/wline.c
similarity index 98%
rename from part12-wgt/wline.c
rename to part12-wgt/wgt/wline.c
index a1545b1..97f1163 100644
--- a/part12-wgt/wline.c
+++ b/part12-wgt/wgt/wline.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wline (short x, short y, short x2, short y2)
 {
diff --git a/part12-wgt/wmiscb.c b/part12-wgt/wgt/wmiscb.c
similarity index 85%
rename from part12-wgt/wmiscb.c
rename to part12-wgt/wgt/wmiscb.c
index 930c2e9..5f780bf 100644
--- a/part12-wgt/wmiscb.c
+++ b/part12-wgt/wgt/wmiscb.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/mem.h"
+#include "../include/wgt.h"
+#include "../include/mem.h"
 
 extern short bx,by,tx,ty;
 
diff --git a/part12-wgt/wnpblock.c b/part12-wgt/wgt/wnpblock.c
similarity index 97%
rename from part12-wgt/wnpblock.c
rename to part12-wgt/wgt/wnpblock.c
index d40d4b5..1831aec 100644
--- a/part12-wgt/wnpblock.c
+++ b/part12-wgt/wgt/wnpblock.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/mem.h"
+#include "../include/wgt.h"
+#include "../include/mem.h"
 
 // We should replace this with faster version (and xray needs to do the right thing - not sure memcpy is a good replacement)
 #define fastcopy memcpy
diff --git a/part12-wgt/wpal.c b/part12-wgt/wgt/wpal.c
similarity index 99%
rename from part12-wgt/wpal.c
rename to part12-wgt/wgt/wpal.c
index 3a8d967..6ac3dd6 100644
--- a/part12-wgt/wpal.c
+++ b/part12-wgt/wgt/wpal.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wloadpalette (unsigned char *data, color *pal)
 {
diff --git a/part12-wgt/wpixel.c b/part12-wgt/wgt/wpixel.c
similarity index 91%
rename from part12-wgt/wpixel.c
rename to part12-wgt/wgt/wpixel.c
index 0ecdc13..230ef1c 100644
--- a/part12-wgt/wpixel.c
+++ b/part12-wgt/wgt/wpixel.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 unsigned int wgetpixel (short x, short y)
 {
diff --git a/part12-wgt/wresize.c b/part12-wgt/wgt/wresize.c
similarity index 99%
rename from part12-wgt/wresize.c
rename to part12-wgt/wgt/wresize.c
index b16cd8b..a6168b0 100644
--- a/part12-wgt/wresize.c
+++ b/part12-wgt/wgt/wresize.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void resize_horizontal_line (block src, block dest, unsigned int whole,
 	   unsigned int xfrac, unsigned short step, short length)
diff --git a/part12-wgt/wscreen.c b/part12-wgt/wgt/wscreen.c
similarity index 98%
rename from part12-wgt/wscreen.c
rename to part12-wgt/wgt/wscreen.c
index ef5f069..13e4e3a 100644
--- a/part12-wgt/wscreen.c
+++ b/part12-wgt/wgt/wscreen.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 #define fastcopy memcpy
 
diff --git a/part12-wgt/wsetcol.c b/part12-wgt/wgt/wsetcol.c
similarity index 97%
rename from part12-wgt/wsetcol.c
rename to part12-wgt/wgt/wsetcol.c
index 0b01b40..642cbd5 100644
--- a/part12-wgt/wsetcol.c
+++ b/part12-wgt/wgt/wsetcol.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wsetcolor (unsigned int col)
 {
diff --git a/part12-wgt/wsetmode.c b/part12-wgt/wgt/wsetmode.c
similarity index 98%
rename from part12-wgt/wsetmode.c
rename to part12-wgt/wgt/wsetmode.c
index aa644e5..7973519 100644
--- a/part12-wgt/wsetmode.c
+++ b/part12-wgt/wgt/wsetmode.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void vga256(void)
 {
diff --git a/part12-wgt/wskew.c b/part12-wgt/wgt/wskew.c
similarity index 96%
rename from part12-wgt/wskew.c
rename to part12-wgt/wgt/wskew.c
index 2957340..9b0a2a1 100644
--- a/part12-wgt/wskew.c
+++ b/part12-wgt/wgt/wskew.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 #define fastcopy memcpy
 
diff --git a/part12-wgt/wspoly.c b/part12-wgt/wgt/wspoly.c
similarity index 98%
rename from part12-wgt/wspoly.c
rename to part12-wgt/wgt/wspoly.c
index 8f60307..9b32651 100644
--- a/part12-wgt/wspoly.c
+++ b/part12-wgt/wgt/wspoly.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 extern short *pinit_array;
 extern short *pstartx;
diff --git a/part12-wgt/wspr.c b/part12-wgt/wgt/wspr.c
similarity index 99%
rename from part12-wgt/wspr.c
rename to part12-wgt/wgt/wspr.c
index 3bd00ec..c75fd78 100644
--- a/part12-wgt/wspr.c
+++ b/part12-wgt/wgt/wspr.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 /* The following defines should be altered to suit your program needs */
 #define MAX_SPRITES        100
diff --git a/part12-wgt/wtext.c b/part12-wgt/wgt/wtext.c
similarity index 99%
rename from part12-wgt/wtext.c
rename to part12-wgt/wgt/wtext.c
index db88cc0..afc955f 100644
--- a/part12-wgt/wtext.c
+++ b/part12-wgt/wgt/wtext.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 short xc, yc, cstart, cend, curspeed;
 short grid, trans;
diff --git a/part12-wgt/wticker.c b/part12-wgt/wgt/wticker.c
similarity index 94%
rename from part12-wgt/wticker.c
rename to part12-wgt/wgt/wticker.c
index daaff53..2aedb35 100644
--- a/part12-wgt/wticker.c
+++ b/part12-wgt/wgt/wticker.c
@@ -1,5 +1,5 @@
-#include "wgt.h"
-#include "include/multicore.h"
+#include "../include/wgt.h"
+#include "../include/multicore.h"
 
 short ticker_speed, ticker_running;
 unsigned int ticker_interval;
diff --git a/part12-wgt/wvertres.c b/part12-wgt/wgt/wvertres.c
similarity index 97%
rename from part12-wgt/wvertres.c
rename to part12-wgt/wgt/wvertres.c
index 2c910b1..0432583 100644
--- a/part12-wgt/wvertres.c
+++ b/part12-wgt/wgt/wvertres.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 #define fastcopy memcpy
 
diff --git a/part12-wgt/wwarp.c b/part12-wgt/wgt/wwarp.c
similarity index 98%
rename from part12-wgt/wwarp.c
rename to part12-wgt/wgt/wwarp.c
index fbc0133..0c2dd92 100644
--- a/part12-wgt/wwarp.c
+++ b/part12-wgt/wgt/wwarp.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wsline (short x, short y, short x2, short y2, short *y_array)
 {
diff --git a/part12-wgt/wwipe.c b/part12-wgt/wgt/wwipe.c
similarity index 97%
rename from part12-wgt/wwipe.c
rename to part12-wgt/wgt/wwipe.c
index 8e4495c..9e4386c 100644
--- a/part12-wgt/wwipe.c
+++ b/part12-wgt/wgt/wwipe.c
@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wwipe (short x, short y, short x2, short y2, block image)
 {