extracted classes to own file