CPK refactoring - starting separation core - pentaho