simplify filesystem structure