Cleaned up and organized classes in Controllers folder.