moving classes to different packages