The obvious re-arranging of the deck-chairs - CMenuObject now has it's own source and header files.  Now I've just got to sort that crash out.