Refactored packages and split Repository
Added Group Domain
Score should include group scores. Step 1..