Restructure filenames bug fix