Fixup control scripts and unversion directory paths