[PD-dev] restructuring CVS (a tiny little bit)