Moved some classes to another packages