remove orphand class
some design notes
better naming of classes