revise directory names & adjust some files from previous merge
final merging updates (VS 2012 was not very cooperative