angular cleanup #1

just moved all the controller stuff into a separate file