updated with namespaced folders