diff --git a/boards/ice40hx8k_yosys/Makefile b/boards/ice40hx8k/Makefile
similarity index 97%
rename from boards/ice40hx8k_yosys/Makefile
rename to boards/ice40hx8k/Makefile
index 71c8c34..76a7586 100644
--- a/boards/ice40hx8k_yosys/Makefile
+++ b/boards/ice40hx8k/Makefile
@@ -54,6 +54,7 @@ $(BUILDDIR)/apple1.blif: $(SOURCEDIR)/apple1.v \
 	$(SOURCEDIR)/vga/vga.v \
 	$(SOURCEDIR)/vga/vram.v \
 	$(SOURCEDIR)/vga/font_rom.v \
+	$(SOURCEDIR)/ps2keyboard/debounce.v \
 	$(SOURCEDIR)/ps2keyboard/ps2keyboard.v \
 	$(SOURCEDIR)/boards/ice40hx8k/clock_pll.v \
 	$(SOURCEDIR)/boards/ice40hx8k/apple1_hx8k.v
diff --git a/boards/ice40hx8k/appleone.xcf b/boards/ice40hx8k/icecube2/appleone.xcf
similarity index 100%
rename from boards/ice40hx8k/appleone.xcf
rename to boards/ice40hx8k/icecube2/appleone.xcf
diff --git a/boards/ice40hx8k/appleone_sbt.project b/boards/ice40hx8k/icecube2/appleone_sbt.project
similarity index 100%
rename from boards/ice40hx8k/appleone_sbt.project
rename to boards/ice40hx8k/icecube2/appleone_sbt.project
diff --git a/boards/ice40hx8k/appleone_syn.prd b/boards/ice40hx8k/icecube2/appleone_syn.prd
similarity index 100%
rename from boards/ice40hx8k/appleone_syn.prd
rename to boards/ice40hx8k/icecube2/appleone_syn.prd
diff --git a/boards/ice40hx8k/appleone_syn.prj b/boards/ice40hx8k/icecube2/appleone_syn.prj
similarity index 100%
rename from boards/ice40hx8k/appleone_syn.prj
rename to boards/ice40hx8k/icecube2/appleone_syn.prj
diff --git a/boards/ice40hx8k/appleone_syn.sdc b/boards/ice40hx8k/icecube2/appleone_syn.sdc
similarity index 100%
rename from boards/ice40hx8k/appleone_syn.sdc
rename to boards/ice40hx8k/icecube2/appleone_syn.sdc
diff --git a/boards/ice40hx8k/icecube2/ice40hx8k.pcf b/boards/ice40hx8k/icecube2/ice40hx8k.pcf
new file mode 120000
index 0000000..e170993
--- /dev/null
+++ b/boards/ice40hx8k/icecube2/ice40hx8k.pcf
@@ -0,0 +1 @@
+../ice40hx8k.pcf
\ No newline at end of file
diff --git a/boards/ice40hx8k_yosys/ice40hx8k.pcf b/boards/ice40hx8k_yosys/ice40hx8k.pcf
deleted file mode 120000
index b9e107e..0000000
--- a/boards/ice40hx8k_yosys/ice40hx8k.pcf
+++ /dev/null
@@ -1 +0,0 @@
-../ice40hx8k/ice40hx8k.pcf
\ No newline at end of file