Moving to VS2012, organized source