CLOUD-105 coorganized dir structure to prevent ambiguity