Refactoring (mainly added relevant packages)
Support for tracking team trainings