refactor(cs): reorganization