Restructure filenames bug fix 4