Renamed.

However: "cgensupport.h" is still present... otherwise I get
	maaaany type errors... not sure if this needs more attention.