diff --git a/sdl1090/GL_edit.svf b/GL_edit.svf
similarity index 100%
rename from sdl1090/GL_edit.svf
rename to GL_edit.svf
diff --git a/sdl1090/Makefile b/Makefile
similarity index 100%
rename from sdl1090/Makefile
rename to Makefile
diff --git a/sdl1090/README.md b/README.md
similarity index 100%
rename from sdl1090/README.md
rename to README.md
diff --git a/dump1090/anet.c b/anet.c
similarity index 100%
rename from dump1090/anet.c
rename to anet.c
diff --git a/dump1090/anet.h b/anet.h
similarity index 100%
rename from dump1090/anet.h
rename to anet.h
diff --git a/anet.o b/anet.o
new file mode 100644
index 0000000..8863146
Binary files /dev/null and b/anet.o differ
diff --git a/sdl1090/defs.h b/defs.h
similarity index 100%
rename from sdl1090/defs.h
rename to defs.h
diff --git a/sdl1090/draw.c b/draw.c
similarity index 100%
rename from sdl1090/draw.c
rename to draw.c
diff --git a/sdl1090/draw.log.REMOVED.git-id b/draw.log.REMOVED.git-id
similarity index 100%
rename from sdl1090/draw.log.REMOVED.git-id
rename to draw.log.REMOVED.git-id
diff --git a/draw.o b/draw.o
new file mode 100644
index 0000000..55e01e5
Binary files /dev/null and b/draw.o differ
diff --git a/dump1090/dump1090.c b/dump1090.c
similarity index 100%
rename from dump1090/dump1090.c
rename to dump1090.c
diff --git a/sdl1090/dump1090.h b/dump1090.h
similarity index 100%
rename from sdl1090/dump1090.h
rename to dump1090.h
diff --git a/sdl1090/dump1090.log.REMOVED.git-id b/dump1090.log.REMOVED.git-id
similarity index 100%
rename from sdl1090/dump1090.log.REMOVED.git-id
rename to dump1090.log.REMOVED.git-id
diff --git a/dump1090/anet.o b/dump1090/anet.o
deleted file mode 100644
index 78e8fd7..0000000
Binary files a/dump1090/anet.o and /dev/null differ
diff --git a/dump1090/interactive.o b/dump1090/interactive.o
deleted file mode 100644
index 6fdd68c..0000000
Binary files a/dump1090/interactive.o and /dev/null differ
diff --git a/dump1090/mode_ac.o b/dump1090/mode_ac.o
deleted file mode 100644
index b5745f4..0000000
Binary files a/dump1090/mode_ac.o and /dev/null differ
diff --git a/dump1090/mode_s.o.REMOVED.git-id b/dump1090/mode_s.o.REMOVED.git-id
deleted file mode 100644
index d8d6079..0000000
--- a/dump1090/mode_s.o.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-bdd60b55bc0624ff84544a794ae21d71eaf0adc8
\ No newline at end of file
diff --git a/dump1090/net_io.o b/dump1090/net_io.o
deleted file mode 100644
index 92db651..0000000
Binary files a/dump1090/net_io.o and /dev/null differ
diff --git a/dump1090/view1090.REMOVED.git-id b/dump1090/view1090.REMOVED.git-id
deleted file mode 100644
index cd5a2a1..0000000
--- a/dump1090/view1090.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-18958032218e1a8e0ef5b79733e5e4b9dd540f61
\ No newline at end of file
diff --git a/dump1090/view1090.o b/dump1090/view1090.o
deleted file mode 100644
index a9231fc..0000000
Binary files a/dump1090/view1090.o and /dev/null differ
diff --git a/sdl1090/font.c b/font.c
similarity index 100%
rename from sdl1090/font.c
rename to font.c
diff --git a/sdl1090/font.h b/font.h
similarity index 100%
rename from sdl1090/font.h
rename to font.h
diff --git a/font.o b/font.o
new file mode 100644
index 0000000..2f5a7e0
Binary files /dev/null and b/font.o differ
diff --git a/sdl1090/font/DroidSansMono.ttf.REMOVED.git-id b/font/DroidSansMono.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/DroidSansMono.ttf.REMOVED.git-id
rename to font/DroidSansMono.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Envy Code R Bold.ttf.REMOVED.git-id b/font/Envy Code R Bold.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Envy Code R Bold.ttf.REMOVED.git-id
rename to font/Envy Code R Bold.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Envy Code R Italic.ttf.REMOVED.git-id b/font/Envy Code R Italic.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Envy Code R Italic.ttf.REMOVED.git-id
rename to font/Envy Code R Italic.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Envy Code R.ttf.REMOVED.git-id b/font/Envy Code R.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Envy Code R.ttf.REMOVED.git-id
rename to font/Envy Code R.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Monoid-Bold.ttf.REMOVED.git-id b/font/Monoid-Bold.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Monoid-Bold.ttf.REMOVED.git-id
rename to font/Monoid-Bold.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Monoid-Italic.ttf.REMOVED.git-id b/font/Monoid-Italic.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Monoid-Italic.ttf.REMOVED.git-id
rename to font/Monoid-Italic.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Monoid-Regular.ttf.REMOVED.git-id b/font/Monoid-Regular.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Monoid-Regular.ttf.REMOVED.git-id
rename to font/Monoid-Regular.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Monoid-Retina.ttf.REMOVED.git-id b/font/Monoid-Retina.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Monoid-Retina.ttf.REMOVED.git-id
rename to font/Monoid-Retina.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_AmstradPC1512-2y.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_AmstradPC1512-2y.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_AmstradPC1512-2y.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_AmstradPC1512-2y.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_AmstradPC1512.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_AmstradPC1512.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_AmstradPC1512.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_AmstradPC1512.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_BIOS-2x.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_BIOS-2x.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_BIOS-2x.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_BIOS-2x.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_BIOS-2y.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_BIOS-2y.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_BIOS-2y.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_BIOS-2y.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_BIOS.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_BIOS.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_BIOS.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_BIOS.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_CGA-2y.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_CGA-2y.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_CGA-2y.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_CGA-2y.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_CGA.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_CGA.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_CGA.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_CGA.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_CGAthin-2y.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_CGAthin-2y.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_CGAthin-2y.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_CGAthin-2y.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_CGAthin.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_CGAthin.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_CGAthin.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_CGAthin.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_EGA8-2x.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_EGA8-2x.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_EGA8-2x.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_EGA8-2x.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_EGA8.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_EGA8.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_EGA8.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_EGA8.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_EGA9-2x.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_EGA9-2x.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_EGA9-2x.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_EGA9-2x.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_EGA9.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_EGA9.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_EGA9.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_EGA9.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_MDA.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_MDA.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_MDA.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_MDA.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_VGA8-2x.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_VGA8-2x.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_VGA8-2x.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_VGA8-2x.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_VGA8.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_VGA8.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_VGA8.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_VGA8.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_VGA9-2x.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_VGA9-2x.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_VGA9-2x.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_VGA9-2x.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_IBM_VGA9.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_IBM_VGA9.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_IBM_VGA9.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_IBM_VGA9.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_TandyNew_225-2y.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_TandyNew_225-2y.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_TandyNew_225-2y.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_TandyNew_225-2y.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_TandyNew_225.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_TandyNew_225.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_TandyNew_225.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_TandyNew_225.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_TandyNew_TV-2y.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_TandyNew_TV-2y.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_TandyNew_TV-2y.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_TandyNew_TV-2y.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_TandyNew_TV.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_TandyNew_TV.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_TandyNew_TV.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_TandyNew_TV.ttf.REMOVED.git-id
diff --git a/sdl1090/font/PxPlus/PxPlus_VGA_SquarePx.ttf.REMOVED.git-id b/font/PxPlus/PxPlus_VGA_SquarePx.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/PxPlus/PxPlus_VGA_SquarePx.ttf.REMOVED.git-id
rename to font/PxPlus/PxPlus_VGA_SquarePx.ttf.REMOVED.git-id
diff --git a/sdl1090/font/TerminusTTF-4.46.0.ttf.REMOVED.git-id b/font/TerminusTTF-4.46.0.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/TerminusTTF-4.46.0.ttf.REMOVED.git-id
rename to font/TerminusTTF-4.46.0.ttf.REMOVED.git-id
diff --git a/sdl1090/font/TerminusTTF-Bold-4.46.0.ttf.REMOVED.git-id b/font/TerminusTTF-Bold-4.46.0.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/TerminusTTF-Bold-4.46.0.ttf.REMOVED.git-id
rename to font/TerminusTTF-Bold-4.46.0.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-B.ttf.REMOVED.git-id b/font/Ubuntu-B.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-B.ttf.REMOVED.git-id
rename to font/Ubuntu-B.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-BI.ttf.REMOVED.git-id b/font/Ubuntu-BI.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-BI.ttf.REMOVED.git-id
rename to font/Ubuntu-BI.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-C.ttf.REMOVED.git-id b/font/Ubuntu-C.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-C.ttf.REMOVED.git-id
rename to font/Ubuntu-C.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-L.ttf.REMOVED.git-id b/font/Ubuntu-L.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-L.ttf.REMOVED.git-id
rename to font/Ubuntu-L.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-LI.ttf.REMOVED.git-id b/font/Ubuntu-LI.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-LI.ttf.REMOVED.git-id
rename to font/Ubuntu-LI.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-M.ttf.REMOVED.git-id b/font/Ubuntu-M.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-M.ttf.REMOVED.git-id
rename to font/Ubuntu-M.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-MI.ttf.REMOVED.git-id b/font/Ubuntu-MI.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-MI.ttf.REMOVED.git-id
rename to font/Ubuntu-MI.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-R.ttf.REMOVED.git-id b/font/Ubuntu-R.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-R.ttf.REMOVED.git-id
rename to font/Ubuntu-R.ttf.REMOVED.git-id
diff --git a/sdl1090/font/Ubuntu-RI.ttf.REMOVED.git-id b/font/Ubuntu-RI.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/Ubuntu-RI.ttf.REMOVED.git-id
rename to font/Ubuntu-RI.ttf.REMOVED.git-id
diff --git a/sdl1090/font/UbuntuMono-B.ttf.REMOVED.git-id b/font/UbuntuMono-B.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/UbuntuMono-B.ttf.REMOVED.git-id
rename to font/UbuntuMono-B.ttf.REMOVED.git-id
diff --git a/sdl1090/font/UbuntuMono-BI.ttf.REMOVED.git-id b/font/UbuntuMono-BI.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/UbuntuMono-BI.ttf.REMOVED.git-id
rename to font/UbuntuMono-BI.ttf.REMOVED.git-id
diff --git a/sdl1090/font/UbuntuMono-R.ttf.REMOVED.git-id b/font/UbuntuMono-R.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/UbuntuMono-R.ttf.REMOVED.git-id
rename to font/UbuntuMono-R.ttf.REMOVED.git-id
diff --git a/sdl1090/font/UbuntuMono-RI.ttf.REMOVED.git-id b/font/UbuntuMono-RI.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/UbuntuMono-RI.ttf.REMOVED.git-id
rename to font/UbuntuMono-RI.ttf.REMOVED.git-id
diff --git a/sdl1090/font/unifont.ttf.REMOVED.git-id b/font/unifont.ttf.REMOVED.git-id
similarity index 100%
rename from sdl1090/font/unifont.ttf.REMOVED.git-id
rename to font/unifont.ttf.REMOVED.git-id
diff --git a/sdl1090/init.c b/init.c
similarity index 100%
rename from sdl1090/init.c
rename to init.c
diff --git a/sdl1090/init.h b/init.h
similarity index 100%
rename from sdl1090/init.h
rename to init.h
diff --git a/init.o b/init.o
new file mode 100644
index 0000000..be8eca9
Binary files /dev/null and b/init.o differ
diff --git a/sdl1090/input.c b/input.c
similarity index 100%
rename from sdl1090/input.c
rename to input.c
diff --git a/sdl1090/input.h b/input.h
similarity index 100%
rename from sdl1090/input.h
rename to input.h
diff --git a/input.o.REMOVED.git-id b/input.o.REMOVED.git-id
new file mode 100644
index 0000000..11b1bac
--- /dev/null
+++ b/input.o.REMOVED.git-id
@@ -0,0 +1 @@
+9b48800a24ee4c8a8e0c2a773765026724773f6f
\ No newline at end of file
diff --git a/sdl1090/interactive.c b/interactive.c
similarity index 100%
rename from sdl1090/interactive.c
rename to interactive.c
diff --git a/interactive.o b/interactive.o
new file mode 100644
index 0000000..e44c297
Binary files /dev/null and b/interactive.o differ
diff --git a/sdl1090/list.c b/list.c
similarity index 100%
rename from sdl1090/list.c
rename to list.c
diff --git a/list.o b/list.o
new file mode 100644
index 0000000..c793279
Binary files /dev/null and b/list.o differ
diff --git a/sdl1090/magma.h b/magma.h
similarity index 100%
rename from sdl1090/magma.h
rename to magma.h
diff --git a/sdl1090/mapconversion.xlsx.REMOVED.git-id b/mapconversion.xlsx.REMOVED.git-id
similarity index 100%
rename from sdl1090/mapconversion.xlsx.REMOVED.git-id
rename to mapconversion.xlsx.REMOVED.git-id
diff --git a/sdl1090/mapdata.c.REMOVED.git-id b/mapdata.c.REMOVED.git-id
similarity index 100%
rename from sdl1090/mapdata.c.REMOVED.git-id
rename to mapdata.c.REMOVED.git-id
diff --git a/sdl1090/mapdata.h b/mapdata.h
similarity index 100%
rename from sdl1090/mapdata.h
rename to mapdata.h
diff --git a/mapdata.o.REMOVED.git-id b/mapdata.o.REMOVED.git-id
new file mode 100644
index 0000000..4d5c3b8
--- /dev/null
+++ b/mapdata.o.REMOVED.git-id
@@ -0,0 +1 @@
+4d8d502c9a227a17f0fbd09a492c86eb5f1545cb
\ No newline at end of file
diff --git a/sdl1090/maps.c b/maps.c
similarity index 100%
rename from sdl1090/maps.c
rename to maps.c
diff --git a/maps.o.REMOVED.git-id b/maps.o.REMOVED.git-id
new file mode 100644
index 0000000..da9ee88
--- /dev/null
+++ b/maps.o.REMOVED.git-id
@@ -0,0 +1 @@
+2ace4751610e844ddd57046a819bd5e045a690f3
\ No newline at end of file
diff --git a/dump1090/mode_ac.c b/mode_ac.c
similarity index 100%
rename from dump1090/mode_ac.c
rename to mode_ac.c
diff --git a/mode_ac.o b/mode_ac.o
new file mode 100644
index 0000000..e4be162
Binary files /dev/null and b/mode_ac.o differ
diff --git a/dump1090/mode_s.c.REMOVED.git-id b/mode_s.c.REMOVED.git-id
similarity index 100%
rename from dump1090/mode_s.c.REMOVED.git-id
rename to mode_s.c.REMOVED.git-id
diff --git a/mode_s.o.REMOVED.git-id b/mode_s.o.REMOVED.git-id
new file mode 100644
index 0000000..d25222c
--- /dev/null
+++ b/mode_s.o.REMOVED.git-id
@@ -0,0 +1 @@
+a3e48b2319025f5869b2710bf017dfcb96c1fb89
\ No newline at end of file
diff --git a/sdl1090/monokai.c b/monokai.c
similarity index 100%
rename from sdl1090/monokai.c
rename to monokai.c
diff --git a/sdl1090/monokai.h b/monokai.h
similarity index 100%
rename from sdl1090/monokai.h
rename to monokai.h
diff --git a/monokai.o b/monokai.o
new file mode 100644
index 0000000..841bfa3
Binary files /dev/null and b/monokai.o differ
diff --git a/dump1090/net_io.c b/net_io.c
similarity index 100%
rename from dump1090/net_io.c
rename to net_io.c
diff --git a/net_io.o.REMOVED.git-id b/net_io.o.REMOVED.git-id
new file mode 100644
index 0000000..4dadfa7
--- /dev/null
+++ b/net_io.o.REMOVED.git-id
@@ -0,0 +1 @@
+bdaa5132f81b7d6b55135413ab297b03f4791e00
\ No newline at end of file
diff --git a/boot.jpg b/old_hw_build/boot.jpg
similarity index 100%
rename from boot.jpg
rename to old_hw_build/boot.jpg
diff --git a/boot.psd.REMOVED.git-id b/old_hw_build/boot.psd.REMOVED.git-id
similarity index 100%
rename from boot.psd.REMOVED.git-id
rename to old_hw_build/boot.psd.REMOVED.git-id
diff --git a/build.sh b/old_hw_build/build.sh
similarity index 100%
rename from build.sh
rename to old_hw_build/build.sh
diff --git a/digistump_firmware/encoder_loop_debounce/encoder_loop_debounce.ino b/old_hw_build/digistump_firmware/encoder_loop_debounce/encoder_loop_debounce.ino
similarity index 100%
rename from digistump_firmware/encoder_loop_debounce/encoder_loop_debounce.ino
rename to old_hw_build/digistump_firmware/encoder_loop_debounce/encoder_loop_debounce.ino
diff --git a/digistump_firmware/encoder_loop_debounce_002/encoder_loop_debounce_002.ino b/old_hw_build/digistump_firmware/encoder_loop_debounce_002/encoder_loop_debounce_002.ino
similarity index 100%
rename from digistump_firmware/encoder_loop_debounce_002/encoder_loop_debounce_002.ino
rename to old_hw_build/digistump_firmware/encoder_loop_debounce_002/encoder_loop_debounce_002.ino
diff --git a/digistump_firmware/libraries/readme.txt b/old_hw_build/digistump_firmware/libraries/readme.txt
similarity index 100%
rename from digistump_firmware/libraries/readme.txt
rename to old_hw_build/digistump_firmware/libraries/readme.txt
diff --git a/dim.sh b/old_hw_build/dim.sh
similarity index 100%
rename from dim.sh
rename to old_hw_build/dim.sh
diff --git a/dump1090/.gitignore b/old_hw_build/dump1090/.gitignore
similarity index 100%
rename from dump1090/.gitignore
rename to old_hw_build/dump1090/.gitignore
diff --git a/dump1090/Makefile b/old_hw_build/dump1090/Makefile
similarity index 100%
rename from dump1090/Makefile
rename to old_hw_build/dump1090/Makefile
diff --git a/dump1090/README.md b/old_hw_build/dump1090/README.md
similarity index 100%
rename from dump1090/README.md
rename to old_hw_build/dump1090/README.md
diff --git a/dump1090/TODO b/old_hw_build/dump1090/TODO
similarity index 100%
rename from dump1090/TODO
rename to old_hw_build/dump1090/TODO
diff --git a/sdl1090/anet.c b/old_hw_build/dump1090/anet.c
similarity index 100%
rename from sdl1090/anet.c
rename to old_hw_build/dump1090/anet.c
diff --git a/sdl1090/anet.h b/old_hw_build/dump1090/anet.h
similarity index 100%
rename from sdl1090/anet.h
rename to old_hw_build/dump1090/anet.h
diff --git a/dump1090/coaa.h b/old_hw_build/dump1090/coaa.h
similarity index 100%
rename from dump1090/coaa.h
rename to old_hw_build/dump1090/coaa.h
diff --git a/dump1090/coaa1090.obj b/old_hw_build/dump1090/coaa1090.obj
similarity index 100%
rename from dump1090/coaa1090.obj
rename to old_hw_build/dump1090/coaa1090.obj
diff --git a/dump1090/dump1090-win.1.10.3010.14.zip.REMOVED.git-id b/old_hw_build/dump1090/dump1090-win.1.10.3010.14.zip.REMOVED.git-id
similarity index 100%
rename from dump1090/dump1090-win.1.10.3010.14.zip.REMOVED.git-id
rename to old_hw_build/dump1090/dump1090-win.1.10.3010.14.zip.REMOVED.git-id
diff --git a/sdl1090/dump1090.c b/old_hw_build/dump1090/dump1090.c
similarity index 100%
rename from sdl1090/dump1090.c
rename to old_hw_build/dump1090/dump1090.c
diff --git a/dump1090/dump1090.dsp b/old_hw_build/dump1090/dump1090.dsp
similarity index 100%
rename from dump1090/dump1090.dsp
rename to old_hw_build/dump1090/dump1090.dsp
diff --git a/dump1090/dump1090.dsw b/old_hw_build/dump1090/dump1090.dsw
similarity index 100%
rename from dump1090/dump1090.dsw
rename to old_hw_build/dump1090/dump1090.dsw
diff --git a/dump1090/dump1090.h b/old_hw_build/dump1090/dump1090.h
similarity index 100%
rename from dump1090/dump1090.h
rename to old_hw_build/dump1090/dump1090.h
diff --git a/dump1090/dump1090.rc b/old_hw_build/dump1090/dump1090.rc
similarity index 100%
rename from dump1090/dump1090.rc
rename to old_hw_build/dump1090/dump1090.rc
diff --git a/dump1090/dump1090.sh b/old_hw_build/dump1090/dump1090.sh
similarity index 100%
rename from dump1090/dump1090.sh
rename to old_hw_build/dump1090/dump1090.sh
diff --git a/dump1090/interactive.c b/old_hw_build/dump1090/interactive.c
similarity index 100%
rename from dump1090/interactive.c
rename to old_hw_build/dump1090/interactive.c
diff --git a/dump1090/interactive.old b/old_hw_build/dump1090/interactive.old
similarity index 100%
rename from dump1090/interactive.old
rename to old_hw_build/dump1090/interactive.old
diff --git a/dump1090/makedump1090 b/old_hw_build/dump1090/makedump1090
similarity index 100%
rename from dump1090/makedump1090
rename to old_hw_build/dump1090/makedump1090
diff --git a/dump1090/makeppup1090 b/old_hw_build/dump1090/makeppup1090
similarity index 100%
rename from dump1090/makeppup1090
rename to old_hw_build/dump1090/makeppup1090
diff --git a/dump1090/makeview1090 b/old_hw_build/dump1090/makeview1090
similarity index 100%
rename from dump1090/makeview1090
rename to old_hw_build/dump1090/makeview1090
diff --git a/sdl1090/mode_ac.c b/old_hw_build/dump1090/mode_ac.c
similarity index 100%
rename from sdl1090/mode_ac.c
rename to old_hw_build/dump1090/mode_ac.c
diff --git a/sdl1090/mode_s.c.REMOVED.git-id b/old_hw_build/dump1090/mode_s.c.REMOVED.git-id
similarity index 100%
rename from sdl1090/mode_s.c.REMOVED.git-id
rename to old_hw_build/dump1090/mode_s.c.REMOVED.git-id
diff --git a/sdl1090/net_io.c b/old_hw_build/dump1090/net_io.c
similarity index 100%
rename from sdl1090/net_io.c
rename to old_hw_build/dump1090/net_io.c
diff --git a/dump1090/ppup1090.c b/old_hw_build/dump1090/ppup1090.c
similarity index 100%
rename from dump1090/ppup1090.c
rename to old_hw_build/dump1090/ppup1090.c
diff --git a/dump1090/ppup1090.h b/old_hw_build/dump1090/ppup1090.h
similarity index 100%
rename from dump1090/ppup1090.h
rename to old_hw_build/dump1090/ppup1090.h
diff --git a/dump1090/ppup1090.sh b/old_hw_build/dump1090/ppup1090.sh
similarity index 100%
rename from dump1090/ppup1090.sh
rename to old_hw_build/dump1090/ppup1090.sh
diff --git a/dump1090/pthreads/pthread.h b/old_hw_build/dump1090/pthreads/pthread.h
similarity index 100%
rename from dump1090/pthreads/pthread.h
rename to old_hw_build/dump1090/pthreads/pthread.h
diff --git a/dump1090/pthreads/sched.h b/old_hw_build/dump1090/pthreads/sched.h
similarity index 100%
rename from dump1090/pthreads/sched.h
rename to old_hw_build/dump1090/pthreads/sched.h
diff --git a/dump1090/pthreads/semaphore.h b/old_hw_build/dump1090/pthreads/semaphore.h
similarity index 100%
rename from dump1090/pthreads/semaphore.h
rename to old_hw_build/dump1090/pthreads/semaphore.h
diff --git a/dump1090/public_html/config.js b/old_hw_build/dump1090/public_html/config.js
similarity index 100%
rename from dump1090/public_html/config.js
rename to old_hw_build/dump1090/public_html/config.js
diff --git a/dump1090/public_html/coolclock/coolclock.js b/old_hw_build/dump1090/public_html/coolclock/coolclock.js
similarity index 100%
rename from dump1090/public_html/coolclock/coolclock.js
rename to old_hw_build/dump1090/public_html/coolclock/coolclock.js
diff --git a/dump1090/public_html/coolclock/excanvas.js b/old_hw_build/dump1090/public_html/coolclock/excanvas.js
similarity index 100%
rename from dump1090/public_html/coolclock/excanvas.js
rename to old_hw_build/dump1090/public_html/coolclock/excanvas.js
diff --git a/dump1090/public_html/coolclock/moreskins.js b/old_hw_build/dump1090/public_html/coolclock/moreskins.js
similarity index 100%
rename from dump1090/public_html/coolclock/moreskins.js
rename to old_hw_build/dump1090/public_html/coolclock/moreskins.js
diff --git a/dump1090/public_html/extension.js b/old_hw_build/dump1090/public_html/extension.js
similarity index 100%
rename from dump1090/public_html/extension.js
rename to old_hw_build/dump1090/public_html/extension.js
diff --git a/dump1090/public_html/gmap.html b/old_hw_build/dump1090/public_html/gmap.html
similarity index 100%
rename from dump1090/public_html/gmap.html
rename to old_hw_build/dump1090/public_html/gmap.html
diff --git a/dump1090/public_html/options.js b/old_hw_build/dump1090/public_html/options.js
similarity index 100%
rename from dump1090/public_html/options.js
rename to old_hw_build/dump1090/public_html/options.js
diff --git a/dump1090/public_html/planeObject.js b/old_hw_build/dump1090/public_html/planeObject.js
similarity index 100%
rename from dump1090/public_html/planeObject.js
rename to old_hw_build/dump1090/public_html/planeObject.js
diff --git a/dump1090/public_html/script.js b/old_hw_build/dump1090/public_html/script.js
similarity index 100%
rename from dump1090/public_html/script.js
rename to old_hw_build/dump1090/public_html/script.js
diff --git a/dump1090/public_html/style.css b/old_hw_build/dump1090/public_html/style.css
similarity index 100%
rename from dump1090/public_html/style.css
rename to old_hw_build/dump1090/public_html/style.css
diff --git a/dump1090/rtlsdr/rtl-sdr.h b/old_hw_build/dump1090/rtlsdr/rtl-sdr.h
similarity index 100%
rename from dump1090/rtlsdr/rtl-sdr.h
rename to old_hw_build/dump1090/rtlsdr/rtl-sdr.h
diff --git a/dump1090/rtlsdr/rtl-sdr_export.h b/old_hw_build/dump1090/rtlsdr/rtl-sdr_export.h
similarity index 100%
rename from dump1090/rtlsdr/rtl-sdr_export.h
rename to old_hw_build/dump1090/rtlsdr/rtl-sdr_export.h
diff --git a/dump1090/testfiles/modes1.bin.REMOVED.git-id b/old_hw_build/dump1090/testfiles/modes1.bin.REMOVED.git-id
similarity index 100%
rename from dump1090/testfiles/modes1.bin.REMOVED.git-id
rename to old_hw_build/dump1090/testfiles/modes1.bin.REMOVED.git-id
diff --git a/dump1090/tools/debug.html b/old_hw_build/dump1090/tools/debug.html
similarity index 100%
rename from dump1090/tools/debug.html
rename to old_hw_build/dump1090/tools/debug.html
diff --git a/old_hw_build/dump1090/view1090.REMOVED.git-id b/old_hw_build/dump1090/view1090.REMOVED.git-id
new file mode 100644
index 0000000..fbc093e
--- /dev/null
+++ b/old_hw_build/dump1090/view1090.REMOVED.git-id
@@ -0,0 +1 @@
+3574a87a5df1ebab0124dc0e276a82636506f036
\ No newline at end of file
diff --git a/dump1090/view1090.c b/old_hw_build/dump1090/view1090.c
similarity index 100%
rename from dump1090/view1090.c
rename to old_hw_build/dump1090/view1090.c
diff --git a/dump1090/view1090.dsp b/old_hw_build/dump1090/view1090.dsp
similarity index 100%
rename from dump1090/view1090.dsp
rename to old_hw_build/dump1090/view1090.dsp
diff --git a/dump1090/view1090.h b/old_hw_build/dump1090/view1090.h
similarity index 100%
rename from dump1090/view1090.h
rename to old_hw_build/dump1090/view1090.h
diff --git a/dump1090/winstubs.h b/old_hw_build/dump1090/winstubs.h
similarity index 100%
rename from dump1090/winstubs.h
rename to old_hw_build/dump1090/winstubs.h
diff --git a/gpio.py b/old_hw_build/gpio.py
similarity index 100%
rename from gpio.py
rename to old_hw_build/gpio.py
diff --git a/grid.py b/old_hw_build/grid.py
similarity index 100%
rename from grid.py
rename to old_hw_build/grid.py
diff --git a/grid_pc.py b/old_hw_build/grid_pc.py
similarity index 100%
rename from grid_pc.py
rename to old_hw_build/grid_pc.py
diff --git a/key.py b/old_hw_build/key.py
similarity index 100%
rename from key.py
rename to old_hw_build/key.py
diff --git a/key_001.py b/old_hw_build/key_001.py
similarity index 100%
rename from key_001.py
rename to old_hw_build/key_001.py
diff --git a/key_002.py b/old_hw_build/key_002.py
similarity index 100%
rename from key_002.py
rename to old_hw_build/key_002.py
diff --git a/key_003.py b/old_hw_build/key_003.py
similarity index 100%
rename from key_003.py
rename to old_hw_build/key_003.py
diff --git a/rtl_fm_python.so.REMOVED.git-id b/old_hw_build/rtl_fm_python.so.REMOVED.git-id
similarity index 100%
rename from rtl_fm_python.so.REMOVED.git-id
rename to old_hw_build/rtl_fm_python.so.REMOVED.git-id
diff --git a/rtl_fm_python_common.py b/old_hw_build/rtl_fm_python_common.py
similarity index 100%
rename from rtl_fm_python_common.py
rename to old_hw_build/rtl_fm_python_common.py
diff --git a/rtl_fm_python_common.pyc b/old_hw_build/rtl_fm_python_common.pyc
similarity index 100%
rename from rtl_fm_python_common.pyc
rename to old_hw_build/rtl_fm_python_common.pyc
diff --git a/rtl_fm_python_thread.py b/old_hw_build/rtl_fm_python_thread.py
similarity index 100%
rename from rtl_fm_python_thread.py
rename to old_hw_build/rtl_fm_python_thread.py
diff --git a/rtl_fm_python_thread.pyc b/old_hw_build/rtl_fm_python_thread.pyc
similarity index 100%
rename from rtl_fm_python_thread.pyc
rename to old_hw_build/rtl_fm_python_thread.pyc
diff --git a/rtl_fm_python_web.py b/old_hw_build/rtl_fm_python_web.py
similarity index 100%
rename from rtl_fm_python_web.py
rename to old_hw_build/rtl_fm_python_web.py
diff --git a/splash.sh b/old_hw_build/splash.sh
similarity index 100%
rename from splash.sh
rename to old_hw_build/splash.sh
diff --git a/start_key.sh b/old_hw_build/start_key.sh
similarity index 100%
rename from start_key.sh
rename to old_hw_build/start_key.sh
diff --git a/test_001.png b/old_hw_build/test_001.png
similarity index 100%
rename from test_001.png
rename to old_hw_build/test_001.png
diff --git a/sdl1090/parula.c b/parula.c
similarity index 100%
rename from sdl1090/parula.c
rename to parula.c
diff --git a/sdl1090/parula.h b/parula.h
similarity index 100%
rename from sdl1090/parula.h
rename to parula.h
diff --git a/parula.o b/parula.o
new file mode 100644
index 0000000..0218ad0
Binary files /dev/null and b/parula.o differ
diff --git a/sdl1090/pthreads/pthread.h b/pthreads/pthread.h
similarity index 100%
rename from sdl1090/pthreads/pthread.h
rename to pthreads/pthread.h
diff --git a/sdl1090/pthreads/sched.h b/pthreads/sched.h
similarity index 100%
rename from sdl1090/pthreads/sched.h
rename to pthreads/sched.h
diff --git a/sdl1090/pthreads/semaphore.h b/pthreads/semaphore.h
similarity index 100%
rename from sdl1090/pthreads/semaphore.h
rename to pthreads/semaphore.h
diff --git a/sdl1090/rtlsdr/rtl-sdr.h b/rtlsdr/rtl-sdr.h
similarity index 100%
rename from sdl1090/rtlsdr/rtl-sdr.h
rename to rtlsdr/rtl-sdr.h
diff --git a/sdl1090/rtlsdr/rtl-sdr_export.h b/rtlsdr/rtl-sdr_export.h
similarity index 100%
rename from sdl1090/rtlsdr/rtl-sdr_export.h
rename to rtlsdr/rtl-sdr_export.h
diff --git a/sdl1090/.gitignore b/sdl1090/.gitignore
deleted file mode 100644
index b04dcba..0000000
--- a/sdl1090/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-dump1090
diff --git a/sdl1090/view1090.REMOVED.git-id b/sdl1090/view1090.REMOVED.git-id
deleted file mode 100644
index c419972..0000000
--- a/sdl1090/view1090.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-03ce37e44e1175c6d216ace0dc15712026569f3f
\ No newline at end of file
diff --git a/sdl1090/states.svg.REMOVED.git-id b/states.svg.REMOVED.git-id
similarity index 100%
rename from sdl1090/states.svg.REMOVED.git-id
rename to states.svg.REMOVED.git-id
diff --git a/sdl1090/status.c b/status.c
similarity index 100%
rename from sdl1090/status.c
rename to status.c
diff --git a/status.o.REMOVED.git-id b/status.o.REMOVED.git-id
new file mode 100644
index 0000000..70d2908
--- /dev/null
+++ b/status.o.REMOVED.git-id
@@ -0,0 +1 @@
+4c882fece9c30acf73d1f87d59f36e90da75ca30
\ No newline at end of file
diff --git a/sdl1090/structs.h b/structs.h
similarity index 100%
rename from sdl1090/structs.h
rename to structs.h
diff --git a/sdl1090/testfiles/modes1.bin.REMOVED.git-id b/testfiles/modes1.bin.REMOVED.git-id
similarity index 100%
rename from sdl1090/testfiles/modes1.bin.REMOVED.git-id
rename to testfiles/modes1.bin.REMOVED.git-id
diff --git a/sdl1090/tools/debug.html b/tools/debug.html
similarity index 100%
rename from sdl1090/tools/debug.html
rename to tools/debug.html
diff --git a/view1090.REMOVED.git-id b/view1090.REMOVED.git-id
new file mode 100644
index 0000000..fc4bddf
--- /dev/null
+++ b/view1090.REMOVED.git-id
@@ -0,0 +1 @@
+53426cac38852a6505d629ec7324b5ec7a2d18da
\ No newline at end of file
diff --git a/sdl1090/view1090.c b/view1090.c
similarity index 100%
rename from sdl1090/view1090.c
rename to view1090.c
diff --git a/sdl1090/view1090.dSYM/Contents/Info.plist b/view1090.dSYM/Contents/Info.plist
similarity index 100%
rename from sdl1090/view1090.dSYM/Contents/Info.plist
rename to view1090.dSYM/Contents/Info.plist
diff --git a/sdl1090/view1090.dSYM/Contents/Resources/DWARF/view1090.REMOVED.git-id b/view1090.dSYM/Contents/Resources/DWARF/view1090.REMOVED.git-id
similarity index 100%
rename from sdl1090/view1090.dSYM/Contents/Resources/DWARF/view1090.REMOVED.git-id
rename to view1090.dSYM/Contents/Resources/DWARF/view1090.REMOVED.git-id
diff --git a/sdl1090/view1090.dsp b/view1090.dsp
similarity index 100%
rename from sdl1090/view1090.dsp
rename to view1090.dsp
diff --git a/sdl1090/view1090.h b/view1090.h
similarity index 100%
rename from sdl1090/view1090.h
rename to view1090.h
diff --git a/view1090.o.REMOVED.git-id b/view1090.o.REMOVED.git-id
new file mode 100644
index 0000000..983c72a
--- /dev/null
+++ b/view1090.o.REMOVED.git-id
@@ -0,0 +1 @@
+a1f04fa3c4375ebfef8558b27bf27cad234f3a4e
\ No newline at end of file
diff --git a/sdl1090/winstubs.h b/winstubs.h
similarity index 100%
rename from sdl1090/winstubs.h
rename to winstubs.h