Changed to modules using requirejs - part2