Move more code
4 files changed