Misc cleanups and CVS surgery. Move a number of header and source files