Modified imports according to new filenames.