more fixes following up with the directory fix. Also, disabled methods of Data requiring java.nio.file.Files as it requires java 7