Restructure namespaces and folders.