Merge "Revert "Create folder structure in backend for onboarded descriptor - RIFT...