Saving before code reorganization