Add some more folders and namespaces