Dealing with the new filename structure