Finished adding data contracts
Moved config files