Made corrections to controllers to correct errors

Error corrections with bloc mentor Oliver
Renamed files

files renames and others deleted to correct routing issues