Some refactoring and file structure change.
Upgraded to MSVS2013