structure modified, some classes renamed