Updated modules to global/AMD pattern