more designed classes; Reference hierarchy redone