Update patch files and file lists.
Fixes #758
This was a left over from the 'vi' editor
This patch changes the top-level directory layout as a preparatory step for improving the tools for managing 3rd-party source codes. The rationale is described in the issue referenced below. Issue #1082