Modified Swift structure and class filenames