Organized modules. Improved fun.lua