Get rid of DIRECTORY_SEPARATOR for consistency