Updated Visual Studio and Open Watcom build control files to account for recent reorganization of the code base.