fix folder structure (again)