created the classes for a better class diagram.

Still not connected the diamond classes.