more pointless subdir renaming