Modified to have singular naming convention for models and controllers
renamed plural file names to singular forms