Renamed some files
Some changes
some changes to view