A bit of re-organisation
small change
Commit moq, fix build