Renaming namespaces to comply with new root folder