Use File, not URI for all locations
Removed unneeded locking