Move to File.separatorChar for path building
Add Java7 TODOs