Moved OutFileExtension due to unused code
Cleanup of URI handling
Updated unit tests