Move the team kit parsing to more suitable locations