Renamed and moved classes, added class comments