Refactor our starship operator for category_organisation model