Fix missing files, fix namings in controller as changed to Model