Move some classes to pgp
Reorder imports to conform to checkstyle config