Moved some model classes to PCL
refactored composite key
Moved another class to PCL
Using PCL Model classes
Fixed unit tests. Not optimal by any means