Original commit message from CVS: Fixed some plugins
Original commit message from CVS: unforming dir names