Suggestion for your class layout.

I hope I'm not overstepping here, I just though some feedback would be helpful. If you prefer to be left alone I understand and don't hesitate to tell me.