Moved logic to controllers, naming convention change