moving CVS stuff around a bit