a bunch of refactoring and renaming models to have Pkkup prefix