diff --git a/plasma/Makefile b/plasma/Makefile
new file mode 100644
index 0000000..6d47fc4
--- /dev/null
+++ b/plasma/Makefile
@@ -0,0 +1,17 @@
+TARGET = bootldr
+DIRS   = tools bootldr logic
+
+all:
+	for n in $(DIRS); do $(MAKE) -C $$n || exit 1; done
+
+tool:
+	make -C tools 
+
+logic:
+	make -C logic 
+
+bootldr: tool
+	make -C bootldr
+
+clean:
+	for n in $(DIRS); do $(MAKE) -C $$n clean || exit 1; done 
diff --git a/plasma/src/Makefile b/plasma/bootldr/Makefile
similarity index 100%
rename from plasma/src/Makefile
rename to plasma/bootldr/Makefile
diff --git a/plasma/src/bootldr.c b/plasma/bootldr/bootldr.c
similarity index 100%
rename from plasma/src/bootldr.c
rename to plasma/bootldr/bootldr.c
diff --git a/plasma/logic/ram_image.vhd b/plasma/logic/ram_image.vhd
index 4aefd07..e4e9bba 100644
--- a/plasma/logic/ram_image.vhd
+++ b/plasma/logic/ram_image.vhd
@@ -62,7 +62,7 @@ INIT_11 => X"0c000c2608240c3c000c020c240c3c00000c240c3c020c3c083c0c003c000c00",
 INIT_12 => X"00100082260c00240800100080afafaf270003ac001030008c343c3c08240c00",
 INIT_13 => X"2424142c3002242400afafafaf272703008f8f8f00140082000c2682000c2414",
 INIT_14 => X"24243c3c2703008f8c3c10000caf2730038c343c240827038f8f8f8f0216260c",
-INIT_15 => X"740a00616d20423a003231303241656c62747267650a24038c0014ac00248c3c",
+INIT_15 => X"740a00616d20423a003230303241656c62747267650a24038c0014ac00248c3c",
 INIT_16 => X"617965330a7769796532006f61796531006e706e724f303030206e6569612020",
 INIT_17 => X"4600753900736838006979656137617965613673647475350a62697965340079",
 INIT_18 => X"37336820660a0d786e6e0a786e750a3d6541206820720a3e00616f446f42316f",
@@ -139,7 +139,7 @@ INIT_11 => X"0000000300440002400040004400024000004400020000020006000004000000",
 INIT_12 => X"00400002100040110080400082b1bfb0bd00e0a40040420062a3050200040040",
 INIT_13 => X"646440624312111080bfb0b1b2bdbde000b0b1bf004000024000100200000451",
 INIT_14 => X"63440302bde000bf6203400000bfbd42e06263030400bde0b0b1b2bf12111000",
-INIT_15 => X"6957007320666f0a003a38313470726f6f686f73744742e0a200834045848205",
+INIT_15 => X"6957007320666f0a003a36313770726f6f686f73744742e0a200834045848205",
 INIT_16 => X"64206d2e006f74206d2e007264206d2e007374752074303078616b206d726266",
 INIT_17 => X"2e006d2e0075652e0074206d772e64206d772e73646f6d2e007974206d2e0074",
 INIT_18 => X"3834207769430a3e2074433e206556207364006569654120007320526d203270",
@@ -216,7 +216,7 @@ INIT_11 => X"022000ff010b0200200220000c02009000000c02002002000100002810200000",
 INIT_12 => X"00000000000220000280000000000000ff00000010ff00000000200001000220",
 INIT_13 => X"000000000010ff009000000000ff00001000000000ff000020020000000200ff",
 INIT_14 => X"0c0c0000000000000020ff000200ff0000000020000200000000000010ffff02",
-INIT_15 => X"6e61006866726f0000343a30207220616f656d20697200000000ff0010000010",
+INIT_15 => X"6e61006866726f0000333a30207220616f656d20697200000000ff0010000010",
 INIT_16 => X"20726f20007265776f20006420726f20003a69204d680a303174656c6179696f",
 INIT_17 => X"20007020006d63200065776f20200a726f20200a72207020007465776f200065",
 INIT_18 => X"3e353169726f002068206f2068206100736400786e7364000068662020663879",
@@ -293,7 +293,7 @@ INIT_11 => X"4f21b1cf6a6c4f00214f21b1384f002100c5244f0021450040028f210021a300",
 INIT_12 => X"000d00000145210a6021160000141810e000080021fc020000200000400a4521",
 INIT_13 => X"5730020a0f06fc1c211c101418e020082110141800f500002145010000450df8",
 INIT_14 => X"fcdc0000180800100000fd008c10e80108002000494520081014181c06f8fc45",
-INIT_15 => X"6769000a6c6f74000030320032200064742020666e6584080000fb0021040000",
+INIT_15 => X"6769000a6c6f74000030340032200064742020666e6584080000fb0021040000",
 INIT_16 => X"6265724d00642072724d000a7765724d000a6f4f656500303020646967206e72",
 INIT_17 => X"43000a44000a6b43000a72726d520065726d52006561204a00652072724d000a",
 INIT_18 => X"203632746d6e00006569750065696c002072003e20736400000a6c7444724b20",