Adding VS2012 support
Refactoring of directory structure