add new classes

split of to calculation and main