Merge pull request #11 from jontsai/master

a bunch of refactoring and renaming models to have Pkkup prefix