put all the code in one file for now to work around compiler bug R=gri,rsc DELTA=168 (120 added, 41 deleted, 7 changed) OCL=15100 CL=15100
