Moves some classes to pg4j package