Renaming files to better reflect responsibilities.
More renaming of files, and some deletions.
More file deletions, and work on PGS-18.
Changes from demo.
Merge branch 'master' into demo
"Replacing Master branch with Demo branch."