simplify folder structure