CPK Refactoring in progress, must also add to cpf-core and pentaho due to cpk dependencies