add Extras and Demos so autogen can work