Moved out controllers and factories to new files