Get rid of ResolutionServices, minor changes to ClassFileInfo