ccs re-org + bug fix