fix folder structure