NEXUS-5993: Simplified support classes

And rationalized uses of it and uses of Files.