Fixed issue with Namespace/Folder