Re-orgs

Got a bit carried away with what a player was responsible for. Moving
everything around