Renamed/move a couple files, fixed some namespaces, and added all new things to grunt build