Changes for Excercise overview

Refactoring team into excercise