Restructed derivitive generation code to reflect new CND.
Save session after removing old derivatives.