Continue moving code out of the clients world.cpp into files that make more sense