Rearranged trainer folders. Updated upgrades.