Added Team object and changed pkg structure