Class restructuring. Added new (empty) classes. Uploaded class diagram for core classes.