Cleaning, changing file names & upgrading to UI-Router