unify folder structure