Rearranging files and correcting namespaces.