NEXT: Organize data

NEXT: Organize data
Merge branch 'patch-7' of https://github.com/sirDonovan/Pokemon-Showdown into patch-7