diff --git a/Makefile b/Makefile
index 298b75d..d0a43cd 100644
--- a/Makefile
+++ b/Makefile
@@ -30,15 +30,15 @@ cjson.a: external/json/*.c
 	${MAKE} -Cexternal/json
 	mv -f external/json/cjson.a cjson.a
 
-liblua.a: external/luasrc/*.c
-	${MAKE} -Cexternal/luasrc
-	mv -f external/luasrc/liblua.a .
+liblua.a: external/lua/*.c
+	${MAKE} -Cexternal/lua
+	mv -f external/lua/liblua.a .
 
 clean:
 	rm -f csto libcallisto.a ${OBJS} ${LIBS}
 	rm -fr include doc/*.html doc/modules
 clean-all: clean
-	${MAKE} -s -Cexternal/luasrc clean
+	${MAKE} -s -Cexternal/lua clean
 	${MAKE} -s -Cexternal/json clean
 
 doc:
@@ -48,7 +48,7 @@ install:
 	mkdir -p include/callisto
 	mkdir -p "${DESTDIR}${PREFIX}"/{bin,include,lib}
 	cp -f callisto.h include/callisto
-	cp -f external/luasrc/{lua.h,lualib.h,lauxlib.h,luaconf.h} include/callisto
+	cp -f external/lua/{lua.h,lualib.h,lauxlib.h,luaconf.h} include/callisto
 	cp -f csto "${DESTDIR}${PREFIX}"/bin
 	cp -fR include/callisto "${DESTDIR}${PREFIX}"/include
 	cp -f libcallisto.a "${DESTDIR}${PREFIX}"/lib
diff --git a/config.mk b/config.mk
index 8182aea..5dbc926 100644
--- a/config.mk
+++ b/config.mk
@@ -2,7 +2,7 @@ PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/man
 
 CC       = cc
-CFLAGS   = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -Iexternal/luasrc
+CFLAGS   = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -Iexternal/lua
 CPPFLAGS = -D_DEFAULT_SOURCE
 LDFLAGS  = -lm
 
diff --git a/external/json/Makefile b/external/json/Makefile
index c110e5d..f77f1f5 100644
--- a/external/json/Makefile
+++ b/external/json/Makefile
@@ -13,7 +13,7 @@
 ##### Build defaults #####
 CC     = cc
 AR     = ar cr
-CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../luasrc
+CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../lua
 OBJS   = dtoa.o fpconv.o g_fmt.o lua_cjson.o strbuf.o
 
 ##### End customisable sections #####
diff --git a/external/luasrc/Makefile b/external/lua/Makefile
similarity index 100%
rename from external/luasrc/Makefile
rename to external/lua/Makefile
diff --git a/external/luasrc/README b/external/lua/README
similarity index 100%
rename from external/luasrc/README
rename to external/lua/README
diff --git a/external/luasrc/lapi.c b/external/lua/lapi.c
similarity index 100%
rename from external/luasrc/lapi.c
rename to external/lua/lapi.c
diff --git a/external/luasrc/lapi.h b/external/lua/lapi.h
similarity index 100%
rename from external/luasrc/lapi.h
rename to external/lua/lapi.h
diff --git a/external/luasrc/lauxlib.c b/external/lua/lauxlib.c
similarity index 100%
rename from external/luasrc/lauxlib.c
rename to external/lua/lauxlib.c
diff --git a/external/luasrc/lauxlib.h b/external/lua/lauxlib.h
similarity index 100%
rename from external/luasrc/lauxlib.h
rename to external/lua/lauxlib.h
diff --git a/external/luasrc/lbaselib.c b/external/lua/lbaselib.c
similarity index 100%
rename from external/luasrc/lbaselib.c
rename to external/lua/lbaselib.c
diff --git a/external/luasrc/lcode.c b/external/lua/lcode.c
similarity index 100%
rename from external/luasrc/lcode.c
rename to external/lua/lcode.c
diff --git a/external/luasrc/lcode.h b/external/lua/lcode.h
similarity index 100%
rename from external/luasrc/lcode.h
rename to external/lua/lcode.h
diff --git a/external/luasrc/lcorolib.c b/external/lua/lcorolib.c
similarity index 100%
rename from external/luasrc/lcorolib.c
rename to external/lua/lcorolib.c
diff --git a/external/luasrc/lctype.c b/external/lua/lctype.c
similarity index 100%
rename from external/luasrc/lctype.c
rename to external/lua/lctype.c
diff --git a/external/luasrc/lctype.h b/external/lua/lctype.h
similarity index 100%
rename from external/luasrc/lctype.h
rename to external/lua/lctype.h
diff --git a/external/luasrc/ldblib.c b/external/lua/ldblib.c
similarity index 99%
rename from external/luasrc/ldblib.c
rename to external/lua/ldblib.c
index 9b40a34..6dcbaa9 100644
--- a/external/luasrc/ldblib.c
+++ b/external/lua/ldblib.c
@@ -379,7 +379,7 @@ static int db_sethook (lua_State *L) {
   if (!luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)) {
     /* table just created; initialize it */
     lua_pushliteral(L, "k");
-    lua_setfield(L, -2, "__mode");  /* hooktable.__mode = "k" */
+    lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
     lua_pushvalue(L, -1);
     lua_setmetatable(L, -2);  /* metatable(hooktable) = hooktable */
   }
diff --git a/external/luasrc/ldebug.c b/external/lua/ldebug.c
similarity index 100%
rename from external/luasrc/ldebug.c
rename to external/lua/ldebug.c
diff --git a/external/luasrc/ldebug.h b/external/lua/ldebug.h
similarity index 100%
rename from external/luasrc/ldebug.h
rename to external/lua/ldebug.h
diff --git a/external/luasrc/ldo.c b/external/lua/ldo.c
similarity index 100%
rename from external/luasrc/ldo.c
rename to external/lua/ldo.c
diff --git a/external/luasrc/ldo.h b/external/lua/ldo.h
similarity index 100%
rename from external/luasrc/ldo.h
rename to external/lua/ldo.h
diff --git a/external/luasrc/ldump.c b/external/lua/ldump.c
similarity index 100%
rename from external/luasrc/ldump.c
rename to external/lua/ldump.c
diff --git a/external/luasrc/lfunc.c b/external/lua/lfunc.c
similarity index 100%
rename from external/luasrc/lfunc.c
rename to external/lua/lfunc.c
diff --git a/external/luasrc/lfunc.h b/external/lua/lfunc.h
similarity index 100%
rename from external/luasrc/lfunc.h
rename to external/lua/lfunc.h
diff --git a/external/luasrc/lgc.c b/external/lua/lgc.c
similarity index 100%
rename from external/luasrc/lgc.c
rename to external/lua/lgc.c
diff --git a/external/luasrc/lgc.h b/external/lua/lgc.h
similarity index 100%
rename from external/luasrc/lgc.h
rename to external/lua/lgc.h
diff --git a/external/luasrc/linit.c b/external/lua/linit.c
similarity index 100%
rename from external/luasrc/linit.c
rename to external/lua/linit.c
diff --git a/external/luasrc/liolib.c b/external/lua/liolib.c
similarity index 100%
rename from external/luasrc/liolib.c
rename to external/lua/liolib.c
diff --git a/external/luasrc/ljumptab.h b/external/lua/ljumptab.h
similarity index 100%
rename from external/luasrc/ljumptab.h
rename to external/lua/ljumptab.h
diff --git a/external/luasrc/llex.c b/external/lua/llex.c
similarity index 100%
rename from external/luasrc/llex.c
rename to external/lua/llex.c
diff --git a/external/luasrc/llex.h b/external/lua/llex.h
similarity index 100%
rename from external/luasrc/llex.h
rename to external/lua/llex.h
diff --git a/external/luasrc/llimits.h b/external/lua/llimits.h
similarity index 100%
rename from external/luasrc/llimits.h
rename to external/lua/llimits.h
diff --git a/external/luasrc/lmathlib.c b/external/lua/lmathlib.c
similarity index 100%
rename from external/luasrc/lmathlib.c
rename to external/lua/lmathlib.c
diff --git a/external/luasrc/lmem.c b/external/lua/lmem.c
similarity index 100%
rename from external/luasrc/lmem.c
rename to external/lua/lmem.c
diff --git a/external/luasrc/lmem.h b/external/lua/lmem.h
similarity index 100%
rename from external/luasrc/lmem.h
rename to external/lua/lmem.h
diff --git a/external/luasrc/loadlib.c b/external/lua/loadlib.c
similarity index 100%
rename from external/luasrc/loadlib.c
rename to external/lua/loadlib.c
diff --git a/external/luasrc/lobject.c b/external/lua/lobject.c
similarity index 100%
rename from external/luasrc/lobject.c
rename to external/lua/lobject.c
diff --git a/external/luasrc/lobject.h b/external/lua/lobject.h
similarity index 100%
rename from external/luasrc/lobject.h
rename to external/lua/lobject.h
diff --git a/external/luasrc/lopcodes.c b/external/lua/lopcodes.c
similarity index 100%
rename from external/luasrc/lopcodes.c
rename to external/lua/lopcodes.c
diff --git a/external/luasrc/lopcodes.h b/external/lua/lopcodes.h
similarity index 100%
rename from external/luasrc/lopcodes.h
rename to external/lua/lopcodes.h
diff --git a/external/luasrc/lopnames.h b/external/lua/lopnames.h
similarity index 100%
rename from external/luasrc/lopnames.h
rename to external/lua/lopnames.h
diff --git a/external/luasrc/loslib.c b/external/lua/loslib.c
similarity index 100%
rename from external/luasrc/loslib.c
rename to external/lua/loslib.c
diff --git a/external/luasrc/lparser.c b/external/lua/lparser.c
similarity index 100%
rename from external/luasrc/lparser.c
rename to external/lua/lparser.c
diff --git a/external/luasrc/lparser.h b/external/lua/lparser.h
similarity index 100%
rename from external/luasrc/lparser.h
rename to external/lua/lparser.h
diff --git a/external/luasrc/lprefix.h b/external/lua/lprefix.h
similarity index 100%
rename from external/luasrc/lprefix.h
rename to external/lua/lprefix.h
diff --git a/external/luasrc/lstate.c b/external/lua/lstate.c
similarity index 100%
rename from external/luasrc/lstate.c
rename to external/lua/lstate.c
diff --git a/external/luasrc/lstate.h b/external/lua/lstate.h
similarity index 100%
rename from external/luasrc/lstate.h
rename to external/lua/lstate.h
diff --git a/external/luasrc/lstring.c b/external/lua/lstring.c
similarity index 100%
rename from external/luasrc/lstring.c
rename to external/lua/lstring.c
diff --git a/external/luasrc/lstring.h b/external/lua/lstring.h
similarity index 100%
rename from external/luasrc/lstring.h
rename to external/lua/lstring.h
diff --git a/external/luasrc/lstrlib.c b/external/lua/lstrlib.c
similarity index 100%
rename from external/luasrc/lstrlib.c
rename to external/lua/lstrlib.c
diff --git a/external/luasrc/ltable.c b/external/lua/ltable.c
similarity index 100%
rename from external/luasrc/ltable.c
rename to external/lua/ltable.c
diff --git a/external/luasrc/ltable.h b/external/lua/ltable.h
similarity index 100%
rename from external/luasrc/ltable.h
rename to external/lua/ltable.h
diff --git a/external/luasrc/ltablib.c b/external/lua/ltablib.c
similarity index 100%
rename from external/luasrc/ltablib.c
rename to external/lua/ltablib.c
diff --git a/external/luasrc/ltm.c b/external/lua/ltm.c
similarity index 100%
rename from external/luasrc/ltm.c
rename to external/lua/ltm.c
diff --git a/external/luasrc/ltm.h b/external/lua/ltm.h
similarity index 100%
rename from external/luasrc/ltm.h
rename to external/lua/ltm.h
diff --git a/external/luasrc/lua.c b/external/lua/lua.c
similarity index 100%
rename from external/luasrc/lua.c
rename to external/lua/lua.c
diff --git a/external/luasrc/lua.h b/external/lua/lua.h
similarity index 100%
rename from external/luasrc/lua.h
rename to external/lua/lua.h
diff --git a/external/luasrc/lua.hpp b/external/lua/lua.hpp
similarity index 100%
rename from external/luasrc/lua.hpp
rename to external/lua/lua.hpp
diff --git a/external/luasrc/luac.c b/external/lua/luac.c
similarity index 100%
rename from external/luasrc/luac.c
rename to external/lua/luac.c
diff --git a/external/luasrc/luaconf.h b/external/lua/luaconf.h
similarity index 100%
rename from external/luasrc/luaconf.h
rename to external/lua/luaconf.h
diff --git a/external/luasrc/lualib.h b/external/lua/lualib.h
similarity index 100%
rename from external/luasrc/lualib.h
rename to external/lua/lualib.h
diff --git a/external/luasrc/lundump.c b/external/lua/lundump.c
similarity index 100%
rename from external/luasrc/lundump.c
rename to external/lua/lundump.c
diff --git a/external/luasrc/lundump.h b/external/lua/lundump.h
similarity index 100%
rename from external/luasrc/lundump.h
rename to external/lua/lundump.h
diff --git a/external/luasrc/lutf8lib.c b/external/lua/lutf8lib.c
similarity index 100%
rename from external/luasrc/lutf8lib.c
rename to external/lua/lutf8lib.c
diff --git a/external/luasrc/lvm.c b/external/lua/lvm.c
similarity index 100%
rename from external/luasrc/lvm.c
rename to external/lua/lvm.c
diff --git a/external/luasrc/lvm.h b/external/lua/lvm.h
similarity index 100%
rename from external/luasrc/lvm.h
rename to external/lua/lvm.h
diff --git a/external/luasrc/lzio.c b/external/lua/lzio.c
similarity index 100%
rename from external/luasrc/lzio.c
rename to external/lua/lzio.c
diff --git a/external/luasrc/lzio.h b/external/lua/lzio.h
similarity index 100%
rename from external/luasrc/lzio.h
rename to external/lua/lzio.h