Pull request for contoller seperations

Controllers separated into their own files.