DDF-142: Updated names of folders and packages to match new naming.