chaanged organization of classes