renaming and refactoring of various classes
further comment updating