Move some more code around
2 files changed