code re-org