Some cleanup. CGame project works again; re-arranged delcarations.