Reorganised CategoryService and Core