diff --git a/lib/Doctrine/ClassMetadata.php b/lib/Doctrine/ClassMetadata.php
index 6a00bcc2d..677a06f5f 100644
--- a/lib/Doctrine/ClassMetadata.php
+++ b/lib/Doctrine/ClassMetadata.php
@@ -32,7 +32,7 @@
  * @since 2.0
  * @todo Rename to ClassDescriptor.
  */
-class Doctrine_ClassMetadata implements Doctrine_Configurable, Serializable
+class Doctrine_ClassMetadata implements Doctrine_Common_Configurable, Serializable
 {
     /* The inheritance mapping types */
     /**
diff --git a/lib/Doctrine/Configurable.php b/lib/Doctrine/Common/Configurable.php
similarity index 91%
rename from lib/Doctrine/Configurable.php
rename to lib/Doctrine/Common/Configurable.php
index f0d47344d..1725d095b 100644
--- a/lib/Doctrine/Configurable.php
+++ b/lib/Doctrine/Common/Configurable.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- *  $Id$
+ *  $Id: Configurable.php 4523 2008-06-15 15:56:28Z romanb $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,11 +27,11 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
  * @since       2.0
- * @version     $Revision$
+ * @version     $Revision: 4523 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Roman Borschel <roman@code-factory.org>
  */
-interface Doctrine_Configurable
+interface Doctrine_Common_Configurable
 {
     public function getAttribute($name);
     public function setAttribute($name, $value);
diff --git a/lib/Doctrine/Manager.php b/lib/Doctrine/Manager.php
index 2adf187a3..625126da0 100644
--- a/lib/Doctrine/Manager.php
+++ b/lib/Doctrine/Manager.php
@@ -33,7 +33,7 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @todo Remove.
  */
-class Doctrine_Manager implements Doctrine_Configurable, Countable, IteratorAggregate
+class Doctrine_Manager implements Doctrine_Common_Configurable, Countable, IteratorAggregate
 {
     /**
      * @var array $connections          an array containing all the opened connections