Add FileUtils
Add EnvironmentConstants; use it and FileUtils to make paths
Remove EnvironmentConstants from versioning
Merge branch 'portability'