small file re-organize