[Upg] Filesystem organization