Moved all controller stuff to one file