Refactored categories and groups structure