Removing some files, making changes to model and controllers, please check for my comments