Renamed application / controller to Application and Controller, fixed some other stuff