diff --git a/scripts/build.c++.app/TopSource.cpp b/scripts/build.app.c++-qt/TopSource.cpp
similarity index 100%
rename from scripts/build.c++.app/TopSource.cpp
rename to scripts/build.app.c++-qt/TopSource.cpp
diff --git a/scripts/build.c++.qtapp/build.app b/scripts/build.app.c++-qt/build.app
similarity index 100%
rename from scripts/build.c++.qtapp/build.app
rename to scripts/build.app.c++-qt/build.app
diff --git a/scripts/build.c++.app/build.default b/scripts/build.app.c++-qt/build.default
similarity index 100%
rename from scripts/build.c++.app/build.default
rename to scripts/build.app.c++-qt/build.default
diff --git a/scripts/build.c++.app/build.install b/scripts/build.app.c++-qt/build.install
similarity index 100%
rename from scripts/build.c++.app/build.install
rename to scripts/build.app.c++-qt/build.install
diff --git a/scripts/build.c++.app/build.install-app b/scripts/build.app.c++-qt/build.install-app
similarity index 100%
rename from scripts/build.c++.app/build.install-app
rename to scripts/build.app.c++-qt/build.install-app
diff --git a/scripts/build.c++.qtapp/build.monolithic b/scripts/build.app.c++-qt/build.monolithic
similarity index 100%
rename from scripts/build.c++.qtapp/build.monolithic
rename to scripts/build.app.c++-qt/build.monolithic
diff --git a/scripts/build.c++.app/instantiate b/scripts/build.app.c++-qt/instantiate
similarity index 100%
rename from scripts/build.c++.app/instantiate
rename to scripts/build.app.c++-qt/instantiate
diff --git a/scripts/build.c++.qtapp/TopSource.cpp b/scripts/build.app.c++/TopSource.cpp
similarity index 100%
rename from scripts/build.c++.qtapp/TopSource.cpp
rename to scripts/build.app.c++/TopSource.cpp
diff --git a/scripts/build.c++.app/build.app b/scripts/build.app.c++/build.app
similarity index 100%
rename from scripts/build.c++.app/build.app
rename to scripts/build.app.c++/build.app
diff --git a/scripts/build.c++.qtapp/build.default b/scripts/build.app.c++/build.default
similarity index 100%
rename from scripts/build.c++.qtapp/build.default
rename to scripts/build.app.c++/build.default
diff --git a/scripts/build.c++.qtapp/build.install b/scripts/build.app.c++/build.install
similarity index 100%
rename from scripts/build.c++.qtapp/build.install
rename to scripts/build.app.c++/build.install
diff --git a/scripts/build.c++.qtapp/build.install-app b/scripts/build.app.c++/build.install-app
similarity index 100%
rename from scripts/build.c++.qtapp/build.install-app
rename to scripts/build.app.c++/build.install-app
diff --git a/scripts/build.c++.app/build.monolithic b/scripts/build.app.c++/build.monolithic
similarity index 100%
rename from scripts/build.c++.app/build.monolithic
rename to scripts/build.app.c++/build.monolithic
diff --git a/scripts/build.c++.qtapp/instantiate b/scripts/build.app.c++/instantiate
similarity index 100%
rename from scripts/build.c++.qtapp/instantiate
rename to scripts/build.app.c++/instantiate
diff --git a/scripts/build.c.app/TopSource.c b/scripts/build.app.c/TopSource.c
similarity index 100%
rename from scripts/build.c.app/TopSource.c
rename to scripts/build.app.c/TopSource.c
diff --git a/scripts/build.c.app/build.app b/scripts/build.app.c/build.app
similarity index 100%
rename from scripts/build.c.app/build.app
rename to scripts/build.app.c/build.app
diff --git a/scripts/build.c.app/build.default b/scripts/build.app.c/build.default
similarity index 100%
rename from scripts/build.c.app/build.default
rename to scripts/build.app.c/build.default
diff --git a/scripts/build.c.app/build.install b/scripts/build.app.c/build.install
similarity index 100%
rename from scripts/build.c.app/build.install
rename to scripts/build.app.c/build.install
diff --git a/scripts/build.c.app/build.install-app b/scripts/build.app.c/build.install-app
similarity index 100%
rename from scripts/build.c.app/build.install-app
rename to scripts/build.app.c/build.install-app
diff --git a/scripts/build.c.app/build.monolithic b/scripts/build.app.c/build.monolithic
similarity index 100%
rename from scripts/build.c.app/build.monolithic
rename to scripts/build.app.c/build.monolithic
diff --git a/scripts/build.c.app/instantiate b/scripts/build.app.c/instantiate
similarity index 100%
rename from scripts/build.c.app/instantiate
rename to scripts/build.app.c/instantiate
diff --git a/scripts/build.doxygen.docs/Doxyfile.in b/scripts/build.docs.doxygen/Doxyfile.in
similarity index 100%
rename from scripts/build.doxygen.docs/Doxyfile.in
rename to scripts/build.docs.doxygen/Doxyfile.in
diff --git a/scripts/build.doxygen.docs/MainPage.dox b/scripts/build.docs.doxygen/MainPage.dox
similarity index 100%
rename from scripts/build.doxygen.docs/MainPage.dox
rename to scripts/build.docs.doxygen/MainPage.dox
diff --git a/scripts/build.doxygen.docs/build.default b/scripts/build.docs.doxygen/build.default
similarity index 100%
rename from scripts/build.doxygen.docs/build.default
rename to scripts/build.docs.doxygen/build.default
diff --git a/scripts/build.doxygen.docs/build.docs b/scripts/build.docs.doxygen/build.docs
similarity index 100%
rename from scripts/build.doxygen.docs/build.docs
rename to scripts/build.docs.doxygen/build.docs
diff --git a/scripts/build.doxygen.docs/build.install b/scripts/build.docs.doxygen/build.install
similarity index 100%
rename from scripts/build.doxygen.docs/build.install
rename to scripts/build.docs.doxygen/build.install
diff --git a/scripts/build.doxygen.docs/build.install-docs b/scripts/build.docs.doxygen/build.install-docs
similarity index 100%
rename from scripts/build.doxygen.docs/build.install-docs
rename to scripts/build.docs.doxygen/build.install-docs
diff --git a/scripts/build.doxygen.docs/instantiate b/scripts/build.docs.doxygen/instantiate
similarity index 100%
rename from scripts/build.doxygen.docs/instantiate
rename to scripts/build.docs.doxygen/instantiate
diff --git a/scripts/build.none.files/build.install b/scripts/build.files.none/build.install
similarity index 100%
rename from scripts/build.none.files/build.install
rename to scripts/build.files.none/build.install
diff --git a/scripts/build.none.files/build.install-files b/scripts/build.files.none/build.install-files
similarity index 100%
rename from scripts/build.none.files/build.install-files
rename to scripts/build.files.none/build.install-files
diff --git a/scripts/build.none.files/instantiate b/scripts/build.files.none/instantiate
similarity index 100%
rename from scripts/build.none.files/instantiate
rename to scripts/build.files.none/instantiate
diff --git a/scripts/build.firmware.gpasm/BottomSource.asm b/scripts/build.firmware.gpasm/BottomSource.asm
new file mode 100644
index 0000000..8ebd13a
--- /dev/null
+++ b/scripts/build.firmware.gpasm/BottomSource.asm
@@ -0,0 +1,13 @@
+; @P@/src/@NAME@/BottomSource.asm
+;
+;  (c)2006, @AUTHOR@, <@EMAIL@>.
+;  Released under the GNU GPLv2. See file COPYING or
+;  http://www.gnu.org/copyleft/gpl.html for details.
+;
+
+	; EOF
+	END
+
+; options for text editors
+; kate: @KATE_MODELINE@
+; vim: @VIM_MODELINE@
diff --git a/scripts/build.firmware.gpasm/TopSource.asm b/scripts/build.firmware.gpasm/TopSource.asm
new file mode 100644
index 0000000..2233a89
--- /dev/null
+++ b/scripts/build.firmware.gpasm/TopSource.asm
@@ -0,0 +1,16 @@
+; @P@/src/@NAME@/TopSource.asm
+;
+;  (c)2006, @AUTHOR@, <@EMAIL@>.
+;  Released under the GNU GPLv2. See file COPYING or
+;  http://www.gnu.org/copyleft/gpl.html for details.
+;
+
+	; include processor definitions
+	include p16f877.inc
+
+	; set up configuration bits
+	__CONFIG A & B
+
+; options for text editors
+; kate: @KATE_MODELINE@
+; vim: @VIM_MODELINE@
diff --git a/scripts/build.sdcc.firmware/build.default b/scripts/build.firmware.gpasm/build.default
similarity index 100%
rename from scripts/build.sdcc.firmware/build.default
rename to scripts/build.firmware.gpasm/build.default
diff --git a/scripts/build.firmware.gpasm/build.firmware b/scripts/build.firmware.gpasm/build.firmware
new file mode 100644
index 0000000..746ad40
--- /dev/null
+++ b/scripts/build.firmware.gpasm/build.firmware
@@ -0,0 +1,43 @@
+# These are external variables, and shouldn't clash with anything else
+#  @CNAME@
+#  @CNAME@_BUILT
+#
+
+if [ -z ${@CNAME@_BUILT} ]
+then
+    @CNAME@="obj/@NAME@.hex"
+    EXTRAS="" # @TODO@ cflags, libs
+    PROCESSOR="16f877" # @TODO@ processor type
+
+    echo "Building firmware ${@CNAME@}..."
+
+    do_cmd source src/@NAME@/build.monolithic || return 1
+
+    MODIFIED=0
+    for test in ${MONOLITHIC_TESTS} ${SRC}
+    do
+        if [ ${test} -nt ${@CNAME@} ]
+        then
+            MODIFIED=1
+            break
+        fi
+    done
+
+    if [ ${MODIFIED} -ne 0 ]
+    then
+        echo " Compiling..."
+
+        [ -z "${GPASM}" ] && GPASM="gpasm"
+        do_cmd ${GPASM} -p"${PROCESSOR}" -o "${@CNAME@}" ${SRC} ${EXTRAS} || return 1
+
+        print_success "Firmware built"
+    else
+        print_success "Firmware up to date"
+    fi
+
+    @CNAME@_BUILT=1
+
+fi
+
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.sdcc.firmware/build.install b/scripts/build.firmware.gpasm/build.install
similarity index 100%
rename from scripts/build.sdcc.firmware/build.install
rename to scripts/build.firmware.gpasm/build.install
diff --git a/scripts/build.sdcc.firmware/build.install-firmware b/scripts/build.firmware.gpasm/build.install-firmware
similarity index 100%
rename from scripts/build.sdcc.firmware/build.install-firmware
rename to scripts/build.firmware.gpasm/build.install-firmware
diff --git a/scripts/build.firmware.gpasm/build.monolithic b/scripts/build.firmware.gpasm/build.monolithic
new file mode 100644
index 0000000..15bf7da
--- /dev/null
+++ b/scripts/build.firmware.gpasm/build.monolithic
@@ -0,0 +1,18 @@
+# These are external variables, and shouldn't clash with anything else
+#  @CNAME@_MONOLITHIC
+#
+
+SRC="obj/@NAME@.asm"
+MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
+
+if [ -z "${@CNAME@_MONOLITHIC}" ]
+then
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopSource,BottomSource}.asm)"
+    make_monolithic ${SRC} none || return 1
+
+    @CNAME@_MONOLITHIC=1
+    MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
+fi
+
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.sdcc.firmware/instantiate b/scripts/build.firmware.gpasm/instantiate
similarity index 100%
rename from scripts/build.sdcc.firmware/instantiate
rename to scripts/build.firmware.gpasm/instantiate
diff --git a/scripts/build.sdcc.firmware/TopSource.c b/scripts/build.firmware.sdcc/TopSource.c
similarity index 100%
rename from scripts/build.sdcc.firmware/TopSource.c
rename to scripts/build.firmware.sdcc/TopSource.c
diff --git a/scripts/build.firmware.sdcc/build.default b/scripts/build.firmware.sdcc/build.default
new file mode 100644
index 0000000..7575e55
--- /dev/null
+++ b/scripts/build.firmware.sdcc/build.default
@@ -0,0 +1 @@
+source src/@NAME@/build.firmware
diff --git a/scripts/build.sdcc.firmware/build.firmware b/scripts/build.firmware.sdcc/build.firmware
similarity index 100%
rename from scripts/build.sdcc.firmware/build.firmware
rename to scripts/build.firmware.sdcc/build.firmware
diff --git a/scripts/build.firmware.sdcc/build.install b/scripts/build.firmware.sdcc/build.install
new file mode 100644
index 0000000..9869fed
--- /dev/null
+++ b/scripts/build.firmware.sdcc/build.install
@@ -0,0 +1 @@
+source src/@NAME@/build.install-firmware
diff --git a/scripts/build.firmware.sdcc/build.install-firmware b/scripts/build.firmware.sdcc/build.install-firmware
new file mode 100644
index 0000000..e720ead
--- /dev/null
+++ b/scripts/build.firmware.sdcc/build.install-firmware
@@ -0,0 +1,12 @@
+build_target @NAME@
+
+# make paths (this is for Gentoo in particular)
+build_dir_tree "${HEXDIR}" || return 1
+
+# install binary
+echo "Installing firmware into '${HEXDIR}'"
+install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1
+print_success "Done"
+
+# kate: @KATE_MODELINE@
+# vim: @VIM_MODELINE@
diff --git a/scripts/build.sdcc.firmware/build.monolithic b/scripts/build.firmware.sdcc/build.monolithic
similarity index 100%
rename from scripts/build.sdcc.firmware/build.monolithic
rename to scripts/build.firmware.sdcc/build.monolithic
diff --git a/scripts/build.firmware.sdcc/instantiate b/scripts/build.firmware.sdcc/instantiate
new file mode 100644
index 0000000..9fb90de
--- /dev/null
+++ b/scripts/build.firmware.sdcc/instantiate
@@ -0,0 +1,11 @@
+if [ $# -ne 0 ]
+then
+    print_failure "Too many arguments. None required for this module."
+    exit 1
+fi
+
+do_parameter_subst
+true
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/scripts/build.c++.lib/BottomHeader.h b/scripts/build.lib.c++/BottomHeader.h
similarity index 100%
rename from scripts/build.c++.lib/BottomHeader.h
rename to scripts/build.lib.c++/BottomHeader.h
diff --git a/scripts/build.c++.lib/TopHeader.h b/scripts/build.lib.c++/TopHeader.h
similarity index 100%
rename from scripts/build.c++.lib/TopHeader.h
rename to scripts/build.lib.c++/TopHeader.h
diff --git a/scripts/build.c++.lib/TopSource.cpp b/scripts/build.lib.c++/TopSource.cpp
similarity index 100%
rename from scripts/build.c++.lib/TopSource.cpp
rename to scripts/build.lib.c++/TopSource.cpp
diff --git a/scripts/build.c++.lib/build.default b/scripts/build.lib.c++/build.default
similarity index 100%
rename from scripts/build.c++.lib/build.default
rename to scripts/build.lib.c++/build.default
diff --git a/scripts/build.c++.lib/build.install b/scripts/build.lib.c++/build.install
similarity index 100%
rename from scripts/build.c++.lib/build.install
rename to scripts/build.lib.c++/build.install
diff --git a/scripts/build.c++.lib/build.install-lib b/scripts/build.lib.c++/build.install-lib
similarity index 100%
rename from scripts/build.c++.lib/build.install-lib
rename to scripts/build.lib.c++/build.install-lib
diff --git a/scripts/build.c++.lib/build.lib b/scripts/build.lib.c++/build.lib
similarity index 100%
rename from scripts/build.c++.lib/build.lib
rename to scripts/build.lib.c++/build.lib
diff --git a/scripts/build.c++.lib/build.monolithic b/scripts/build.lib.c++/build.monolithic
similarity index 100%
rename from scripts/build.c++.lib/build.monolithic
rename to scripts/build.lib.c++/build.monolithic
diff --git a/scripts/build.c++.lib/instantiate b/scripts/build.lib.c++/instantiate
similarity index 100%
rename from scripts/build.c++.lib/instantiate
rename to scripts/build.lib.c++/instantiate
diff --git a/scripts/build.c++.lib/pkgconf.in b/scripts/build.lib.c++/pkgconf.in
similarity index 100%
rename from scripts/build.c++.lib/pkgconf.in
rename to scripts/build.lib.c++/pkgconf.in
diff --git a/scripts/build.c++.lib/soversion b/scripts/build.lib.c++/soversion
similarity index 100%
rename from scripts/build.c++.lib/soversion
rename to scripts/build.lib.c++/soversion
diff --git a/scripts/build.c.lib/BottomHeader.h b/scripts/build.lib.c/BottomHeader.h
similarity index 100%
rename from scripts/build.c.lib/BottomHeader.h
rename to scripts/build.lib.c/BottomHeader.h
diff --git a/scripts/build.c.lib/TopHeader.h b/scripts/build.lib.c/TopHeader.h
similarity index 100%
rename from scripts/build.c.lib/TopHeader.h
rename to scripts/build.lib.c/TopHeader.h
diff --git a/scripts/build.c.lib/TopSource.c b/scripts/build.lib.c/TopSource.c
similarity index 100%
rename from scripts/build.c.lib/TopSource.c
rename to scripts/build.lib.c/TopSource.c
diff --git a/scripts/build.c.lib/build.default b/scripts/build.lib.c/build.default
similarity index 100%
rename from scripts/build.c.lib/build.default
rename to scripts/build.lib.c/build.default
diff --git a/scripts/build.c.lib/build.install b/scripts/build.lib.c/build.install
similarity index 100%
rename from scripts/build.c.lib/build.install
rename to scripts/build.lib.c/build.install
diff --git a/scripts/build.c.lib/build.install-lib b/scripts/build.lib.c/build.install-lib
similarity index 100%
rename from scripts/build.c.lib/build.install-lib
rename to scripts/build.lib.c/build.install-lib
diff --git a/scripts/build.c.lib/build.lib b/scripts/build.lib.c/build.lib
similarity index 100%
rename from scripts/build.c.lib/build.lib
rename to scripts/build.lib.c/build.lib
diff --git a/scripts/build.c.lib/build.monolithic b/scripts/build.lib.c/build.monolithic
similarity index 100%
rename from scripts/build.c.lib/build.monolithic
rename to scripts/build.lib.c/build.monolithic
diff --git a/scripts/build.c.lib/instantiate b/scripts/build.lib.c/instantiate
similarity index 100%
rename from scripts/build.c.lib/instantiate
rename to scripts/build.lib.c/instantiate
diff --git a/scripts/build.c.lib/pkgconf.in b/scripts/build.lib.c/pkgconf.in
similarity index 100%
rename from scripts/build.c.lib/pkgconf.in
rename to scripts/build.lib.c/pkgconf.in
diff --git a/scripts/build.c.lib/soversion b/scripts/build.lib.c/soversion
similarity index 100%
rename from scripts/build.c.lib/soversion
rename to scripts/build.lib.c/soversion
diff --git a/scripts/build.c++.tests/build.default b/scripts/build.tests.c++/build.default
similarity index 100%
rename from scripts/build.c++.tests/build.default
rename to scripts/build.tests.c++/build.default
diff --git a/scripts/build.c++.tests/build.tests b/scripts/build.tests.c++/build.tests
similarity index 100%
rename from scripts/build.c++.tests/build.tests
rename to scripts/build.tests.c++/build.tests
diff --git a/scripts/build.c++.tests/instantiate b/scripts/build.tests.c++/instantiate
similarity index 100%
rename from scripts/build.c++.tests/instantiate
rename to scripts/build.tests.c++/instantiate
diff --git a/scripts/build.c++.tests/template b/scripts/build.tests.c++/template
similarity index 100%
rename from scripts/build.c++.tests/template
rename to scripts/build.tests.c++/template
diff --git a/scripts/build.c.tests/build.default b/scripts/build.tests.c/build.default
similarity index 100%
rename from scripts/build.c.tests/build.default
rename to scripts/build.tests.c/build.default
diff --git a/scripts/build.c.tests/build.tests b/scripts/build.tests.c/build.tests
similarity index 100%
rename from scripts/build.c.tests/build.tests
rename to scripts/build.tests.c/build.tests
diff --git a/scripts/build.c.tests/instantiate b/scripts/build.tests.c/instantiate
similarity index 100%
rename from scripts/build.c.tests/instantiate
rename to scripts/build.tests.c/instantiate
diff --git a/scripts/build.c.tests/template b/scripts/build.tests.c/template
similarity index 100%
rename from scripts/build.c.tests/template
rename to scripts/build.tests.c/template