Namespaces and folder structure updated v2