Restructure filenames bug fix 2