More
Cleaned up the file handling
Converted to Java 7 Paths