RM-6153 Renamed folder structure.
Merge branch 'master' into Feature/RMLNQSQL-1-DefaultIfEmptySubQueryOptimization