Reorgainze components