Removed Abstract* classes
Introduced the BuiltinURIResolver and GenericURIFactory classes