Restructure for requirejs and grunt build