Rename back
Small reorg, makefile work
Better makefile
Lua Unit tests
Basic cleanup