Renamed/moved around js files and prepared for Angular service and controller