A few build changes and file renames.