diff --git a/lib/Doctrine/Import/Exception.php b/lib/Doctrine/ORM/Import/Exception.php
similarity index 91%
rename from lib/Doctrine/Import/Exception.php
rename to lib/Doctrine/ORM/Import/Exception.php
index ec4cf78f7..a1ca43600 100644
--- a/lib/Doctrine/Import/Exception.php
+++ b/lib/Doctrine/ORM/Import/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');
  * @link        www.phpdoctrine.org
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 3882 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Import_Exception extends Doctrine_Exception
diff --git a/lib/Doctrine/Import/Reader.php b/lib/Doctrine/ORM/Import/Reader.php
similarity index 92%
rename from lib/Doctrine/Import/Reader.php
rename to lib/Doctrine/ORM/Import/Reader.php
index 1096a4fe1..cb0b602b4 100644
--- a/lib/Doctrine/Import/Reader.php
+++ b/lib/Doctrine/ORM/Import/Reader.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Reader.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
@@ -29,7 +29,7 @@
  * @link        www.phpdoctrine.org
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 3882 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 abstract class Doctrine_Import_Reader
diff --git a/lib/Doctrine/Import/Reader/Db.php b/lib/Doctrine/ORM/Import/Reader/Db.php
similarity index 94%
rename from lib/Doctrine/Import/Reader/Db.php
rename to lib/Doctrine/ORM/Import/Reader/Db.php
index ace22f802..73bdacd4a 100644
--- a/lib/Doctrine/Import/Reader/Db.php
+++ b/lib/Doctrine/ORM/Import/Reader/Db.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Db.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
@@ -29,7 +29,7 @@ Doctrine::autoload('Doctrine_Import_Reader');
  * @link        www.phpdoctrine.org
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 3882 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Import_Reader_Db extends Doctrine_Import_Reader
diff --git a/lib/Doctrine/Import/Reader/Exception.php b/lib/Doctrine/ORM/Import/Reader/Exception.php
similarity index 91%
rename from lib/Doctrine/Import/Reader/Exception.php
rename to lib/Doctrine/ORM/Import/Reader/Exception.php
index 9440c25a7..1a41f6f61 100644
--- a/lib/Doctrine/Import/Reader/Exception.php
+++ b/lib/Doctrine/ORM/Import/Reader/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 @@
  * @link        www.phpdoctrine.org
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 3882 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Import_Reader_Exception
diff --git a/lib/Doctrine/Import/Reader/Propel.php b/lib/Doctrine/ORM/Import/Reader/Propel.php
similarity index 92%
rename from lib/Doctrine/Import/Reader/Propel.php
rename to lib/Doctrine/ORM/Import/Reader/Propel.php
index 1f411d12f..055ff379f 100644
--- a/lib/Doctrine/Import/Reader/Propel.php
+++ b/lib/Doctrine/ORM/Import/Reader/Propel.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id$
+ *  $Id: Propel.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_Import_Reader');
  * @link        www.phpdoctrine.org
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @since       1.0
- * @version     $Revision$
+ * @version     $Revision: 3882 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Import_Reader_Xml_Propel extends Doctrine_Import_Reader
diff --git a/lib/Doctrine/Import/Schema.php b/lib/Doctrine/ORM/Import/Schema.php
similarity index 100%
rename from lib/Doctrine/Import/Schema.php
rename to lib/Doctrine/ORM/Import/Schema.php