Any template or language files you change should be put in a /your_template/ folder; then they will be safe from upgrades. Wherever you see a /classic/ folder, you can make a /your_template/ folder, and save the files from say /includes/languages/english.php as /includes/languages/english/your_template/english.php.