Moved some classes to different packages