Move some other classes to different packages