VS2012 files adjusted
Refactoring to new design