Visual Studio changes required for library reorganization