Reestructuring directories and filenames