Corpus directory and zip file fixes and misc fileUtils and java util additions