Renamed class and added controller package