You should make a set of custom template folders so that your changes will be preserved through an upgrade. The /classic/ folders will all be reset and you will lose any changes you have there. The /custom/ files/folders can be copied from your current /classic/ versions.

See the tutorials for custom template info.