cvs cruft
rearrange files