refactored constants from bootstrapper
refactored consts DS, PS back to DIRECTORY_SEPARATOR, PATH_SEPARATOR