Unified filenames, removed unused files.