re-org files/names