Move data contracts into common assembly