Rearrange file structure. Add Team objects