! Distribute stuff into packages, rename, refactor