Fix export problem. Renaming subdirs.