Restructure filenames