Reorgainze code.