Moved some classed to "pdp" package and some to the root