Solution Refactor

Refactoring to include XF.Common.Contracts
Initial Refactor

Refactor of csproj files