Refactor, Build support for VS2012