diff --git a/unit.js.tpl b/unit.js.tpl
index ebbc7c8..418033d 100755
--- a/unit.js.tpl
+++ b/unit.js.tpl
@@ -2,15 +2,36 @@
 
 indent()
 {
-	local tabs="$(printf '\t%.0s' `seq 1 $1`)"
-	sed "s|^|${tabs}|"
+	sed "s|^\(.\)|\t\1|"
+}
+
+moduleName()
+{
+	local fileName="${1##*/}"
+	printf "${fileName%.*}"
+}
+
+MODULES=""
+for file in "${@}"
+do
+	MODULES="${MODULES}:$(moduleName "${file}")"
+done
+MODULES="${MODULES#:}"
+
+includeModule()
+{
+cat <<EOF
+function $(moduleName "${1}")() {
+$(cat "${1}" | indent)
+}
+EOF
 }
 
 cat <<EOF
 var unitJS = (function() {
 	return {
-$(echo "${@}" | sed -e 's| |,\n|g' -e 's|\([^.\n]\+\)\.js|\u\1: \u\1|g' | indent 2)
+$(printf "${MODULES}" | sed -e 's|:|,\n|g' -e 's|[^,\n]\+|&: &|g' | indent | indent)
 	};
-$(cat "${@}" | indent 1)
+$(for file in "${@}"; do includeModule "${file}"; done | indent)
 })();
 EOF