Version .7

Reorganize & upgrade to VS2013 project