A few changes to how files are mapped to extension specific classes.