renaming modules, and moving to define in module init