Refactored Categories and Groups Structure