Refactored contracts to new project
Merge branch '006' into EntityFramework