Convert to using requirejs for module loading