renames files, modified the controllers
renames files, modified the controllers