Making changes to the CVS repository is standard practice. However, instead of moving directories, try copying them (this is called a copy), and then delete the files in their original locations with the usual CVS commands. This way, even your changes will be recorded as part of the story.
Of course, keep a full backup of your CVS files before making any changes,
source
share