Moved stuff around

[!! NOTE TO SELF: Lua programs need to be updated !!]