Refactoring

New code structure
Namespaces accordingly
New class Team (untested work in progress)