Reorganized File structure, SQL related to Teams