Update prefixing and folders with namespace