More code re-org