Moves builders to their own file