Reworked VS2013 solution