diff --git a/README.md b/README.md
index 79d523b..571d005 100644
--- a/README.md
+++ b/README.md
@@ -50,64 +50,28 @@ When you want to see whats happening do a debug run;
 
 	normal run;
 		time make assert-all
-		real    0m2.323s
+		real    0m2.400s
 	
 	debug run at 11 Mhz;
-		time MB_OPENMSX_RENDERER=SDL MB_OPENMSX_THROTTLE=ON make assert-all
-		real    0m40.930s
+		time MB_OPENMSX_RENDERER=SDL MB_OPENMSX_THROTTLE=on make assert-all
+		real    0m49.609s
 	
 	debug run real msx speed;
-		time MB_OPENMSX_RENDERER=SDL MB_OPENMSX_THROTTLE=ON MB_OPENMSX_SPEED=100 make assert-all
-		real    2m8.761s
+		time MB_OPENMSX_RENDERER=SDL MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make assert-all
+		real    2m37.379s
+		
+	debug run with video recorder;
+		time MB_OPENMSX_RENDERER=SDL MB_OPENMSX_RECORDER=on make assert-all
+		real    0m6.556s
 	
 	build parallel;
-		time make -j4 assert-all
-		real    0m1.346s
+		time make -s -j4 assert-all
+		real    0m1.162s
 
 ## Functions
 
 Current set is WIP.
 
-* mb_compile_asm
-* mb_link_asm_lib
-* mb_link_asm
-* mb_link_asm_0000 = call mb_link_asm,$(1),$(2),0x0000
-* mb_link_asm_0100
-* mb_link_asm_1000
-* mb_link_asm_4000
-* mb_link_asm_8000
-* mb_link_asm_C000
-* mb_link_asm_dos = alias for mb_link_asm_0100
-* mb_hex2bin
-* mb_openmsx_dosctl
-* mb_msxhub_file
-* mb_package_emuctl
-* mb_package_dos1
-* mb_package_dos2
-* mb_package_nextor
-* mb_package_macro80
-* mb_package_z80asmuk
-* mb_package_popcom
-* mb_package_dmphex
-* mb_package_baskom
-* mb_package_pmarc
-* mb_package_lhpack
-* mb_package_lhext
-* mb_package_gunzip
-* mb_package_tunzip
-* mb_package_turbo
-* mb_package_binldr
-* mb_package_gfxage
-* mb_msxrom_file
-* mb_msxrom_setup
-* mb_msxrom_extension_ide_nextor
-* mb_msxrom_extension_rs232
-* mb_msxrom_extension_fmpac
-* mb_msxrom_extension_moonsound
-* mb_msxrom_extension_basickun
-* mb_msxrom_machine_Canon_V-20
-* mb_msxrom_machine_Philips_NMS_8250
-* mb_msxrom_machine_Boosted_MSX2_EN
 * mb_autoexec_append_cmd
 * mb_autoexec_append_echo
 * mb_autoexec_append_rem
@@ -123,10 +87,66 @@ Current set is WIP.
 * mb_autoexec_open_gui80_cmd
 * mb_autoexec_safe_cmd
 * mb_autoexec_safe_test
+* mb_msxhub_file
+* mb_msxhub_get_dos1
+* mb_msxhub_get_dos2
+* mb_msxhub_get_nextor
+* mb_msxhub_get_macro80
+* mb_msxhub_get_z80asmuk
+* mb_msxhub_get_popcom
+* mb_msxhub_get_dmphex
+* mb_msxhub_get_baskom
+* mb_msxhub_get_pmarc
+* mb_msxhub_get_lhpack
+* mb_msxhub_get_lhext
+* mb_msxhub_get_gunzip
+* mb_msxhub_get_tunzip
+* mb_msxhub_get_turbo
+* mb_msxhub_get_binldr
+* mb_msxhub_get_gfxage
+* mb_msxrom_file
+* mb_msxrom_setup
+* mb_msxrom_extension_ide
+* mb_msxrom_extension_ide_nextor
+* mb_msxrom_extension_scsi_novaxis
+* mb_msxrom_extension_msxdos22
+* mb_msxrom_extension_rs232
+* mb_msxrom_extension_fmpac
+* mb_msxrom_extension_fmpac_en
+* mb_msxrom_extension_moonsound
+* mb_msxrom_extension_basickun
+* mb_msxrom_machine_Canon_V-20
+* mb_msxrom_machine_Mitsubishi_ML-F80
+* mb_msxrom_machine_Mitsubishi_ML-FX1
+* mb_msxrom_machine_Mitsubishi_ML-G3_ES
+* mb_msxrom_machine_Philips_VG_8000
+* mb_msxrom_machine_Philips_VG_8230
+* mb_msxrom_machine_Philips_NMS_8250
+* mb_msxrom_machine_Toshiba_HX-21.xml
+* mb_msxrom_machine_Yamaha_AX200
+* mb_msxrom_machine_Yamaha_YIS-503IIIR
+* mb_msxrom_machine_Panasonic_FS-A1WSX
+* mb_msxrom_machine_Boosted_MSX2_EN
+* mb_msxrom_machine_Boosted_MSX2+_JP
+* mb_openmsx_setup
+* mb_openmsx_dosctl
+* mb_sdcc_compile_asm
+* mb_sdcc_link_asm_lib
+* mb_sdcc_link_asm
+* mb_sdcc_link_asm_0000 = calls mb_sdcc_link_asm,$(1),$(2),0x0000
+* mb_sdcc_link_asm_0100
+* mb_sdcc_link_asm_1000
+* mb_sdcc_link_asm_4000
+* mb_sdcc_link_asm_8000
+* mb_sdcc_link_asm_C000
+* mb_sdcc_link_asm_dos = calls mb_sdcc_link_asm_0100
+* mb_sdcc_hex2bin
 * mb_clean
 * mb_mkdir
 * mb_delete
 * mb_copy
+* mb_unix2dos
+* mb_dos2unix
 * mb_create_dist
 
 ## Errata
diff --git a/lib/make/mb_build.mk b/lib/make/mb_build.mk
deleted file mode 100644
index ef39403..0000000
--- a/lib/make/mb_build.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-
-MB_BUILD_FLAG_CPU      ?= -mz80
-MB_BUILD_FLAG_LD       ?= --nostdinc
-MB_BUILD_SDASM_FLAGS   ?= -g -l -c -o
-MB_BUILD_SDCC_FLAGS    ?=
-MB_BUILD_SDAR_FLAGS    ?= -rc
-MB_BUILD_SDCC_CMD      ?= $(PATH_SDCC)/sdcc
-MB_BUILD_SDASM_CMD     ?= $(PATH_SDCC)/sdasz80
-MB_BUILD_SDAR_CMD      ?= $(PATH_SDCC)/sdar
-MB_BUILD_SDOBJCOPY_CMD ?= $(PATH_SDCC)/sdobjcopy
-
-# TODO: Add C + mixed support;
-#$(MB_SDASM) -I$(MB_LIBASM_SRC)/include
-#-l$(LIBASM_LINK)
-
-define mb_unix2dos
-	unix2dos -n $(1) $(2)
-endef
-
-define mb_compile_asm
-	@echo === Compile module asm.
-	$(MB_BUILD_SDASM_CMD) $(MB_BUILD_SDASM_FLAGS) $(1) $(2)
-endef
-
-define mb_link_asm_lib
-	@echo === Link module asm lib.
-	$(MB_BUILD_SDAR_CMD) $(MB_BUILD_SDAR_FLAGS) $(1) $(2)
-endef
-
-define mb_link_asm
-	@echo === Link asm module at $(3)
-	$(MB_BUILD_SDCC_CMD) $(MB_BUILD_FLAG_CPU) $(MB_BUILD_SDCC_FLAGS) --no-std-crt0 --code-loc $(3) -o $(1) $(2)
-endef
-define mb_link_asm_0000
-	$(call mb_link_asm,$(1),$(2),0x0000)
-endef
-define mb_link_asm_0100
-	$(call mb_link_asm,$(1),$(2),0x0100)
-endef
-define mb_link_asm_1000
-	$(call mb_link_asm,$(1),$(2),0x1000)
-endef
-define mb_link_asm_4000
-	$(call mb_link_asm,$(1),$(2),0x4000)
-endef
-define mb_link_asm_8000
-	$(call mb_link_asm,$(1),$(2),0x8000)
-endef
-define mb_link_asm_C000
-	$(call mb_link_asm,$(1),$(2),0xC000)
-endef
-define mb_link_asm_dos
-	$(call mb_link_asm_0100,$(1),$(2))
-endef
-
-define mb_hex2bin
-	$(MB_BUILD_SDOBJCOPY_CMD) -I ihex --output-target=binary $(1) $(2)
-endef
diff --git a/lib/make/mb_msxhub.mk b/lib/make/mb_msxhub.mk
index 10a1a85..0c2053a 100644
--- a/lib/make/mb_msxhub.mk
+++ b/lib/make/mb_msxhub.mk
@@ -14,3 +14,98 @@ define mb_msxhub_file
 	$(if $(wildcard $(1)/$(call _mb_lowercase,$(notdir $(2)))),,$(call mb_copy,$(MB_MSXHUB_CACHE)/$(2),$(1)/$(call _mb_lowercase,$(notdir $(2)))))
 	$(if $(filter true,$(3)),$(call mb_copy,$(MB_MSXHUB_CACHE)/$(2),$(1)/$(call _mb_lowercase,$(notdir $(2)))))
 endef
+
+
+#
+# Operating System
+#
+define mb_msxhub_get_dos1
+	$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/MSXDOS.SYS)
+	$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/COMMAND.COM)
+endef
+define mb_msxhub_get_dos2
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
+endef
+define mb_msxhub_get_nextor
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
+endef
+
+
+#
+# Compilers
+#
+define mb_msxhub_get_macro80
+	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/CREF80.COM)
+	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/L80.COM)
+	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/LIB80.COM)
+	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/M80.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOCOM.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOBIN.COM)
+endef
+define mb_msxhub_get_z80asmuk
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/BINTOASM.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/DUMP.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOCOM.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/PRL.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/PRNTOSYM.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/RSX.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/ZSM.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/ZSMPP.COM)
+	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOBIN.COM)
+endef
+
+
+#
+# Compressors
+#
+define mb_msxhub_get_pmarc
+	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMARC.COM)
+	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMCAT.COM)
+	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMEXE2.COM)
+	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMEXT.COM)
+	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMSET.COM)
+	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMSFX2.COM)
+endef
+define mb_msxhub_get_lhpack
+	$(call mb_msxhub_file,$(1),LHPACK/1.00-1/get/LHPACK/lhpack.com)
+endef
+define mb_msxhub_get_lhext
+	$(call mb_msxhub_file,$(1),LHEXT/1.34-2/get/LHEXT/lhext.com)
+endef
+define mb_msxhub_get_gunzip
+	$(call mb_msxhub_file,$(1),GUNZIP/1.1-1/get/GUNZIP/gunzip.com)
+endef
+define mb_msxhub_get_tunzip
+	$(call mb_msxhub_file,$(1),TUNZIP/0.91-1/get/TUNZIP/tunzip.com)
+endef
+define mb_msxhub_get_popcom
+	$(call mb_msxhub_file,$(1),POPCOM/1.00-2/get/POPCOM/popcom.com)
+endef
+
+
+#
+# Tools
+#
+define mb_msxhub_get_turbo
+	$(call mb_msxhub_file,$(1),TURBO/2.1-1/get/TURBO/turbo.com)
+endef
+define mb_msxhub_get_baskom
+	$(call mb_msxhub_file,$(1),BASKOM/1.0-1/get/BASKOM/baskom.com)
+endef
+define mb_msxhub_get_binldr
+	$(call mb_msxhub_file,$(1),BINLDR/1.0.2-1/get/BINLDR/BINLDR.COM)
+endef
+define mb_msxhub_get_dmphex
+	$(call mb_msxhub_file,$(1),DMPHEX/1.00-1/get/DMPHEX/dmphex.com)
+endef
+
+
+#
+# Graphics editors
+#
+define mb_msxhub_get_gfxage
+	$(call mb_msxhub_file,$(1),GFXAGE/0.99-1/get/GFXAGE/gfxage.com)
+endef
+
diff --git a/lib/make/mb_msxrom.mk b/lib/make/mb_msxrom.mk
index 3846fc5..24121a7 100644
--- a/lib/make/mb_msxrom.mk
+++ b/lib/make/mb_msxrom.mk
@@ -59,6 +59,10 @@ define mb_msxrom_extension_basickun
 	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/extensions,machines/sanyo/phc-70fd2_basickun.rom)
 endef
 
+define mb_msxrom_machine_Canon_V-20
+	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/canon/v-20_basic-bios1.rom)
+endef
+
 define mb_msxrom_machine_Mitsubishi_ML-F80
 	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-f80_basic-bios1.rom)
 endef
@@ -74,10 +78,6 @@ define mb_msxrom_machine_Mitsubishi_ML-G3_ES
 	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/mitsubishi/ml-g3_es_rs232.rom)
 endef
 
-define mb_msxrom_machine_Canon_V-20
-	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/canon/v-20_basic-bios1.rom)
-endef
-
 define mb_msxrom_machine_Philips_VG_8000
 	$(call mb_msxrom_file,$(1)-omsx/share/systemroms/machines,machines/philips/vg8000_basic-bios1.rom)
 endef
diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index e691f7e..1275e1b 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -64,5 +64,8 @@ endef
 define mb_openmsx_dosctl
 	$(if $(wildcard $(1)-omsx),,$(call mb_openmsx_setup,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE))))
 	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.com,$(1)))
+	$(if $(wildcard $(1)/reboot.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/reboot.bat,$(1)))
+	$(if $(wildcard $(1)/shutdown.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/shutdown.bat,$(1)))
+	$(if $(wildcard $(1)/z80.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1)))
 	$(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE)))
 endef
diff --git a/lib/make/mb_packages.mk b/lib/make/mb_packages.mk
deleted file mode 100644
index a55bbe5..0000000
--- a/lib/make/mb_packages.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-# MSXHUB fetch package files functions
-define mb_package_emuctl
-	$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/reboot.bat,$(1))
-	$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/shutdown.bat,$(1))
-	$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1))
-endef
-
-#
-# Operating System
-#
-define mb_package_dos1
-	$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/MSXDOS.SYS)
-	$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/COMMAND.COM)
-endef
-define mb_package_dos2
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
-	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
-endef
-define mb_package_nextor
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
-	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
-endef
-
-
-#
-# Compilers
-#
-define mb_package_macro80
-	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/CREF80.COM)
-	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/L80.COM)
-	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/LIB80.COM)
-	$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/M80.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOCOM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOBIN.COM)
-endef
-define mb_package_z80asmuk
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/BINTOASM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/DUMP.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOCOM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/PRL.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/PRNTOSYM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/RSX.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/ZSM.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/ZSMPP.COM)
-	$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOBIN.COM)
-endef
-
-
-#
-# Compressors
-#
-define mb_package_pmarc
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMARC.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMCAT.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMEXE2.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMEXT.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMSET.COM)
-	$(call mb_msxhub_file,$(1),PMARC/2.0-1/get/PMARC/PMSFX2.COM)
-endef
-define mb_package_lhpack
-	$(call mb_msxhub_file,$(1),LHPACK/1.00-1/get/LHPACK/lhpack.com)
-endef
-define mb_package_lhext
-	$(call mb_msxhub_file,$(1),LHEXT/1.34-2/get/LHEXT/lhext.com)
-endef
-define mb_package_gunzip
-	$(call mb_msxhub_file,$(1),GUNZIP/1.1-1/get/GUNZIP/gunzip.com)
-endef
-define mb_package_tunzip
-	$(call mb_msxhub_file,$(1),TUNZIP/0.91-1/get/TUNZIP/tunzip.com)
-endef
-define mb_package_popcom
-	$(call mb_msxhub_file,$(1),POPCOM/1.00-2/get/POPCOM/popcom.com)
-endef
-
-
-#
-# Tools
-#
-define mb_package_turbo
-	$(call mb_msxhub_file,$(1),TURBO/2.1-1/get/TURBO/turbo.com)
-endef
-define mb_package_baskom
-	$(call mb_msxhub_file,$(1),BASKOM/1.0-1/get/BASKOM/baskom.com)
-endef
-define mb_package_binldr
-	$(call mb_msxhub_file,$(1),BINLDR/1.0.2-1/get/BINLDR/BINLDR.COM)
-endef
-define mb_package_dmphex
-	$(call mb_msxhub_file,$(1),DMPHEX/1.00-1/get/DMPHEX/dmphex.com)
-endef
-
-
-#
-# Graphics editors
-#
-define mb_package_gfxage
-	$(call mb_msxhub_file,$(1),GFXAGE/0.99-1/get/GFXAGE/gfxage.com)
-endef
-
diff --git a/lib/make/mb_sdcc.mk b/lib/make/mb_sdcc.mk
new file mode 100644
index 0000000..e8fe860
--- /dev/null
+++ b/lib/make/mb_sdcc.mk
@@ -0,0 +1,54 @@
+
+MB_SDCC_FLAG_CPU    ?= -mz80
+MB_SDCC_FLAG_LD     ?= --nostdinc
+MB_SDCC_ASM_FLAGS   ?= -g -l -c -o
+MB_SDCC_CC_FLAGS    ?=
+MB_SDCC_AR_FLAGS    ?= -rc
+MB_SDCC_CC_CMD      ?= $(PATH_SDCC)/sdcc
+MB_SDCC_ASM_CMD     ?= $(PATH_SDCC)/sdasz80
+MB_SDCC_AR_CMD      ?= $(PATH_SDCC)/sdar
+MB_SDCC_OBJCOPY_CMD ?= $(PATH_SDCC)/sdobjcopy
+
+# TODO: Add C + mixed support;
+#$(MB_SDASM) -I$(MB_LIBASM_SRC)/include
+#-l$(LIBASM_LINK)
+
+define mb_sdcc_compile_asm
+	@echo === Compile module asm.
+	$(MB_SDCC_ASM_CMD) $(MB_SDCC_ASM_FLAGS) $(1) $(2)
+endef
+
+define mb_sdcc_link_asm_lib
+	@echo === Link module asm lib.
+	$(MB_SDCC_AR_CMD) $(MB_SDCC_AR_FLAGS) $(1) $(2)
+endef
+
+define mb_sdcc_link_asm
+	@echo === Link asm module at $(3)
+	$(MB_SDCC_CC_CMD) $(MB_SDCC_FLAG_CPU) $(MB_SDCC_CC_FLAGS) --no-std-crt0 --code-loc $(3) -o $(1) $(2)
+endef
+define mb_sdcc_link_asm_0000
+	$(call mb_sdcc_link_asm,$(1),$(2),0x0000)
+endef
+define mb_sdcc_link_asm_0100
+	$(call mb_sdcc_link_asm,$(1),$(2),0x0100)
+endef
+define mb_sdcc_link_asm_1000
+	$(call mb_sdcc_link_asm,$(1),$(2),0x1000)
+endef
+define mb_sdcc_link_asm_4000
+	$(call mb_sdcc_link_asm,$(1),$(2),0x4000)
+endef
+define mb_sdcc_link_asm_8000
+	$(call mb_sdcc_link_asm,$(1),$(2),0x8000)
+endef
+define mb_sdcc_link_asm_C000
+	$(call mb_sdcc_link_asm,$(1),$(2),0xC000)
+endef
+define mb_sdcc_link_asm_dos
+	$(call mb_sdcc_link_asm_0100,$(1),$(2))
+endef
+
+define mb_sdcc_hex2bin
+	$(MB_SDCC_OBJCOPY_CMD) -I ihex --output-target=binary $(1) $(2)
+endef
diff --git a/lib/make/msxbuild.mk b/lib/make/msxbuild.mk
index 35fd18e..ab93c25 100644
--- a/lib/make/msxbuild.mk
+++ b/lib/make/msxbuild.mk
@@ -51,15 +51,20 @@ endef
 define mb_copy
 	$(MB_COPY) $(1) $(2)
 endef
+define mb_unix2dos
+	unix2dos -q -n $(1) $(2)
+endef
+define mb_dos2unix
+	dos2unix -q -n $(1) $(2)
+endef
 define mb_create_dist
 	@echo === Creating distribution archive.
 	tar -czf $(1) -C $(2) `ls $(2)`
 endef
 
 # Include extra features
-include $(PATH_MSXBUILD)/lib/make/mb_autoexec.mk
+include $(PATH_MSXBUILD)/lib/make/mb_sdcc.mk
 include $(PATH_MSXBUILD)/lib/make/mb_msxrom.mk
 include $(PATH_MSXBUILD)/lib/make/mb_msxhub.mk
-include $(PATH_MSXBUILD)/lib/make/mb_packages.mk
 include $(PATH_MSXBUILD)/lib/make/mb_openmsx.mk
-include $(PATH_MSXBUILD)/lib/make/mb_build.mk
+include $(PATH_MSXBUILD)/lib/make/mb_autoexec.mk
diff --git a/test/ahello-m80/0module.mk b/test/ahello-m80/0module.mk
index 6651eec..038d6c0 100644
--- a/test/ahello-m80/0module.mk
+++ b/test/ahello-m80/0module.mk
@@ -4,9 +4,8 @@ BUILD_HELP        += \\n\\t* $(TEST_AHELLO_M80)/ahello.com\\n\\t* test-ahello-m8
 
 $(TEST_AHELLO_M80):
 	$(call mb_mkdir,$(TEST_AHELLO_M80))
-	$(call mb_package_emuctl,$(TEST_AHELLO_M80))
-	$(call mb_package_macro80,$(TEST_AHELLO_M80))
-	$(call mb_package_nextor,$(TEST_AHELLO_M80))
+	$(call mb_msxhub_get_macro80,$(TEST_AHELLO_M80))
+	$(call mb_msxhub_get_nextor,$(TEST_AHELLO_M80))
 
 $(TEST_AHELLO_M80)/%.mac: test/ahello-m80/%.mac | $(TEST_AHELLO_M80)
 	$(call mb_unix2dos,$<,$@)
diff --git a/test/ahello-sdcc/0module.mk b/test/ahello-sdcc/0module.mk
index d89da41..1ddbcd2 100644
--- a/test/ahello-sdcc/0module.mk
+++ b/test/ahello-sdcc/0module.mk
@@ -4,17 +4,16 @@ BUILD_HELP        += \\n\\t* $(TEST_AHELLO_SDCC)/ahello.com\\n\\t* test-ahello-s
 
 $(TEST_AHELLO_SDCC):
 	$(call mb_mkdir,$(TEST_AHELLO_SDCC))
-	$(call mb_package_emuctl,$(TEST_AHELLO_SDCC))
-	$(call mb_package_nextor,$(TEST_AHELLO_SDCC))
+	$(call mb_msxhub_get_nextor,$(TEST_AHELLO_SDCC))
 
 $(TEST_AHELLO_SDCC)/%.rel: test/ahello-sdcc/%.asm | $(TEST_AHELLO_SDCC)
-	$(call mb_compile_asm,$@,$<)
+	$(call mb_sdcc_compile_asm,$@,$<)
 
 $(TEST_AHELLO_SDCC)/ahello.hex: $(TEST_AHELLO_SDCC)/ahello.rel
-	$(call mb_link_asm_dos,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.rel)
+	$(call mb_sdcc_link_asm_dos,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.rel)
 
 $(TEST_AHELLO_SDCC)/ahello.com: $(TEST_AHELLO_SDCC)/ahello.hex
-	$(call mb_hex2bin,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.com)
+	$(call mb_sdcc_hex2bin,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.com)
 
 .PHONY: test-ahello-sdcc-run
 test-ahello-sdcc-run: $(TEST_AHELLO_SDCC)/ahello.com
diff --git a/test/dist-qa-dos1/0module.mk b/test/dist-qa-dos1/0module.mk
index 55bdfe7..0b63519 100644
--- a/test/dist-qa-dos1/0module.mk
+++ b/test/dist-qa-dos1/0module.mk
@@ -5,8 +5,7 @@ BUILD_HELP              += \\n\\t* test-dist-qa-dos1-run\\n\\t* test-dist-qa-dos
 
 $(TEST_DIST_QA_DOS1):
 	$(call mb_mkdir,$(TEST_DIST_QA_DOS1))
-	$(call mb_package_emuctl,$(TEST_DIST_QA_DOS1))
-	$(call mb_package_dos1,$(TEST_DIST_QA_DOS1))
+	$(call mb_msxhub_get_dos1,$(TEST_DIST_QA_DOS1))
 
 $(TEST_DIST_QA_DOS1)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS1) $(TEST_DIST_DEPS)
 	$(call mb_copy,$<,$@)
diff --git a/test/dist-qa-dos2/0module.mk b/test/dist-qa-dos2/0module.mk
index cabe8da..a942ad9 100644
--- a/test/dist-qa-dos2/0module.mk
+++ b/test/dist-qa-dos2/0module.mk
@@ -5,8 +5,7 @@ BUILD_HELP              += \\n\\t* test-dist-qa-dos2-run\\n\\t* test-dist-qa-dos
 
 $(TEST_DIST_QA_DOS2):
 	$(call mb_mkdir,$(TEST_DIST_QA_DOS2))
-	$(call mb_package_emuctl,$(TEST_DIST_QA_DOS2))
-	$(call mb_package_dos2,$(TEST_DIST_QA_DOS2))
+	$(call mb_msxhub_get_dos2,$(TEST_DIST_QA_DOS2))
 
 $(TEST_DIST_QA_DOS2)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS2) $(TEST_DIST_DEPS)
 	$(call mb_copy,$<,$@)
diff --git a/test/dist-qa-msx1/0module.mk b/test/dist-qa-msx1/0module.mk
index 2156c70..43f9c63 100644
--- a/test/dist-qa-msx1/0module.mk
+++ b/test/dist-qa-msx1/0module.mk
@@ -6,8 +6,7 @@ BUILD_HELP                += \\n\\t* test-dist-qa-msx1-run\\n\\t* test-dist-qa-m
 
 $(TEST_DIST_QA_MSX1):
 	$(call mb_mkdir,$(TEST_DIST_QA_MSX1))
-	$(call mb_package_emuctl,$(TEST_DIST_QA_MSX1))
-	$(call mb_package_dos2,$(TEST_DIST_QA_MSX1))
+	$(call mb_msxhub_get_dos2,$(TEST_DIST_QA_MSX1))
 
 $(TEST_DIST_QA_MSX1)/%: bin/test/dist/% | $(TEST_DIST_QA_MSX1) $(TEST_DIST_DEPS)
 	$(call mb_copy,$<,$@)