Renaming files to better reflect responsibilities.
More renaming of files, and some deletions.
More file deletions, and work on PGS-18.