CPK Refactoring, code cleanup + starting to debug cpf-pentaho