Fixed issues with view controller files. Renamed files with view controller as part of the names.
Fixed issues with view controller files