DDF-593: Removed / moved files
DDF-593: Moved and deleted files
DDF-593: Updated missing name changes, etc.