Match folder structure with namespacing