Removed the abstract and generic URI factories
Improved annotations and documentation
Introduced URI resolvers