Finished separating classes; visibility of fields corrected; comments
cleared up.