move other classes to own file