Re-orgs in Lua to better encapsulation