Major controller cleanup, renaming, and refactoring