Changed the name of controller files, updated static variables, and references.