Improved operations error handling
Changed names to be the same as in Rainers document
Renamed files to have consistent views.