Updated files to match angular style guide see #5983

#5983

Refactored some files,
Renamed some files
etc