Change structure and add Team info page