more file re-org