refactor(cs): organization