use File.join instead of concatenating strings and others path-related cleanups