move to namespaced folders