Move to Makefile
Neaten up Lua and move under /lua for testing