refactored postprocess
renamed system classes