Split up the Boat class

It was REALLY getting way too big!