Refactoring some classes

Signed-off-by: Alexander Book <redchrome@gmx.de>