Reorganized projects for VS 2012