Restructure prep 1

Restructuring for release 2.1 to allow building in VS Express 2013.