Restructure filenames bug fix 3