removed and added controllers and models