Reorganization and added controllers