Consolidated all models into one, and changed controllers to use it instead. Also includes a fix to make redirect in login controller work.