Move and rename files from sub packages.
Fix namespaces for moved files.