Start moving code around into sensible groups.