opitmize folder structure