Restructure filenames bug fix 5