Separte more classes. and now code compiles