Mass reorganization of all major character portraits, some minor characters. Renamed bj and flareon for consistency.