More code shuffling
4 files changed