Made the namespaced folders more flexible.