Moved files from auth. Still needs a lot of cleanup