diff --git a/lib/Doctrine/Cache/Apc.php b/lib/Doctrine/ORM/Cache/Apc.php
similarity index 94%
rename from lib/Doctrine/Cache/Apc.php
rename to lib/Doctrine/ORM/Cache/Apc.php
index 49bbe8cc3..fcee4b724 100644
--- a/lib/Doctrine/Cache/Apc.php
+++ b/lib/Doctrine/ORM/Cache/Apc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Apc.php 4910 2008-09-12 08:51:56Z romanb $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,7 +27,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 4910 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Cache_Apc extends Doctrine_Cache_Driver
diff --git a/lib/Doctrine/Cache/Array.php b/lib/Doctrine/ORM/Cache/Array.php
similarity index 94%
rename from lib/Doctrine/Cache/Array.php
rename to lib/Doctrine/ORM/Cache/Array.php
index 3cec54cad..8d61e1fde 100644
--- a/lib/Doctrine/Cache/Array.php
+++ b/lib/Doctrine/ORM/Cache/Array.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Array.php 4910 2008-09-12 08:51:56Z romanb $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -25,7 +25,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 4910 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Cache_Array implements Doctrine_Cache_Interface
diff --git a/lib/Doctrine/Cache/Db.php b/lib/Doctrine/ORM/Cache/Db.php
similarity index 95%
rename from lib/Doctrine/Cache/Db.php
rename to lib/Doctrine/ORM/Cache/Db.php
index a6ae1d877..bd5bd5352 100644
--- a/lib/Doctrine/Cache/Db.php
+++ b/lib/Doctrine/ORM/Cache/Db.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Db.php 3931 2008-03-05 11:24:33Z romanb $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,7 +27,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 3931 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Cache_Db extends Doctrine_Cache_Driver implements Countable
diff --git a/lib/Doctrine/Cache/Driver.php b/lib/Doctrine/ORM/Cache/Driver.php
similarity index 93%
rename from lib/Doctrine/Cache/Driver.php
rename to lib/Doctrine/ORM/Cache/Driver.php
index fff7b6a2d..99038fa72 100644
--- a/lib/Doctrine/Cache/Driver.php
+++ b/lib/Doctrine/ORM/Cache/Driver.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Driver.php 4910 2008-09-12 08:51:56Z romanb $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -25,7 +25,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 4910 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 abstract class Doctrine_Cache_Driver implements Doctrine_Cache_Interface
diff --git a/lib/Doctrine/Cache/Exception.php b/lib/Doctrine/ORM/Cache/Exception.php
similarity index 91%
rename from lib/Doctrine/Cache/Exception.php
rename to lib/Doctrine/ORM/Cache/Exception.php
index 71c4ec1bf..7ba86d28d 100644
--- a/lib/Doctrine/Cache/Exception.php
+++ b/lib/Doctrine/ORM/Cache/Exception.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Exception.php 3882 2008-02-22 18:11:35Z jwage $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,7 +27,7 @@ Doctrine::autoload('Doctrine_Exception');
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 3882 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Cache_Exception extends Doctrine_Exception
diff --git a/lib/Doctrine/Cache/Interface.php b/lib/Doctrine/ORM/Cache/Interface.php
similarity index 94%
rename from lib/Doctrine/Cache/Interface.php
rename to lib/Doctrine/ORM/Cache/Interface.php
index 25eb21905..ef608d0b7 100644
--- a/lib/Doctrine/Cache/Interface.php
+++ b/lib/Doctrine/ORM/Cache/Interface.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Interface.php 3931 2008-03-05 11:24:33Z romanb $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -27,7 +27,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 3931 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 interface Doctrine_Cache_Interface 
diff --git a/lib/Doctrine/Cache/Memcache.php b/lib/Doctrine/ORM/Cache/Memcache.php
similarity index 95%
rename from lib/Doctrine/Cache/Memcache.php
rename to lib/Doctrine/ORM/Cache/Memcache.php
index 1a03980f1..0b1da74f0 100644
--- a/lib/Doctrine/Cache/Memcache.php
+++ b/lib/Doctrine/ORM/Cache/Memcache.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Memcache.php 4910 2008-09-12 08:51:56Z romanb $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -25,7 +25,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 4910 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Cache_Memcache extends Doctrine_Cache_Driver
diff --git a/lib/Doctrine/Cache/Xcache.php b/lib/Doctrine/ORM/Cache/Xcache.php
similarity index 100%
rename from lib/Doctrine/Cache/Xcache.php
rename to lib/Doctrine/ORM/Cache/Xcache.php