Began refactor of teams and types.
Removed unusued class.
Refactoring and tests.