Large re-organisation of files and namespaces.