Reorganized some files, checks if in team