Renamed a few things, edited VS project files to reflect new names.