diff --git a/lib/rdf.php b/lib/rdf.php
index f225056..98bfe93 100644
--- a/lib/rdf.php
+++ b/lib/rdf.php
@@ -511,7 +511,7 @@ public static function uriPredicates()
 	}
 }
 
-require_once(dirname(__FILE__) . '/' . EREGANSU_RDF_IMPLEMENTATION . '.php');
+require_once(dirname(__FILE__) . '/rdf/' . EREGANSU_RDF_IMPLEMENTATION . '.php');
 
 class RDFInstance extends RDFInstanceBase
 {
diff --git a/lib/phprdf.php b/lib/rdf/phprdf.php
similarity index 100%
rename from lib/phprdf.php
rename to lib/rdf/phprdf.php
diff --git a/lib/redland.php b/lib/rdf/redland.php
similarity index 97%
rename from lib/redland.php
rename to lib/rdf/redland.php
index 105072f..8cfe19e 100644
--- a/lib/redland.php
+++ b/lib/rdf/redland.php
@@ -476,7 +476,8 @@ public function __construct($name, $mime = null, $uri = null, $world = null)
 	
 	public function serializeModelToString(RedlandModel $model, $baseURI = null)
 	{
-		foreach(RDF::$namespaces as $uri => $prefix)
+		$ns = URI::namespaces();
+		foreach($ns as $uri => $prefix)
 		{
 			librdf_serializer_set_namespace($this->resource, librdf_new_uri($this->world->resource, $uri), $prefix);
 		}
@@ -485,7 +486,8 @@ public function serializeModelToString(RedlandModel $model, $baseURI = null)
 
 	public function serializeModelToFile(RedlandModel $model, $fileName, $baseURI = null)
 	{
-		foreach(RDF::$namespaces as $uri => $prefix)
+		$ns = URI::namespaces();
+		foreach($ns as $uri => $prefix)
 		{
 			librdf_serializer_set_namespace($this->resource, librdf_new_uri($this->world->resource, $uri), $prefix);
 		}
@@ -1828,62 +1830,9 @@ public function promote($subject)
 	}
 
 	/* Given a URI, generate a prefix:short form name */
-	public function namespacedName($qname, $generate = true)
+	public function namespacedName($uri, $generate = true)
 	{
-		RDF::ns();
-		$qname = strval($qname);
-		if(!isset($this->qnames[$qname]))
-		{
-			if(false !== ($p = strrpos($qname, '#')))
-			{
-				$ns = substr($qname, 0, $p + 1);
-				$lname = substr($qname, $p + 1);
-			}
-			else if(false !== ($p = strrpos($qname, ' ')))
-			{
-				$ns = substr($qname, 0, $p);
-				$lname = substr($qname, $p + 1);
-			}
-			else if(false !== ($p = strrpos($qname, '/')))
-			{
-				$ns = substr($qname, 0, $p + 1);
-				$lname = substr($qname, $p + 1);
-			}
-			else
-			{
-				return $qname;
-			}
-			if(!strcmp($ns, XMLNS::xml))
-			{
-				return 'xml:' . $lname;
-			}
-			if(!strcmp($ns, XMLNS::xmlns))
-			{
-				return 'xmlns:' . $lname;
-			}
-			if(!isset($this->namespaces[$ns]))
-			{
-				if(isset(RDF::$namespaces[$ns]))
-				{
-					$this->namespaces[$ns] = RDF::$namespaces[$ns];
-				}
-				else if($generate)
-				{
-					$this->namespaces[$ns] = 'ns' . count($this->namespaces);
-				}
-				else
-				{
-					return $qname;
-				}
-			}
-			if(!strlen($lname))
-			{
-				return $qname;
-			}
-			$pname = $this->namespaces[$ns] . ':' . $lname;
-			$this->qnames[$qname] = $pname;
-		}
-		return $this->qnames[$qname];		
+		return URI::contractUri($uri, $generate);
 	}
 
 	/* Return the RDFInstance which is either explicitly or implicitly the