tweak folder structure.