Merge branch 'restructure' of D:\work\decision\decisionservices with conflicts.
fix merge problem