Folders now lined up to namespaces.