Move code around
3 files changed