Spec reorganization.