More file renames to be more obvious.  Updated Grunt RequireJS configuration to try and be more simple.