Changed how files are imported