diff --git a/.gitignore b/.gitignore
index 75ee8b3..3db2605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,5 @@ README
 /test/fixtures/project/log/*
 /test/fixtures/project/data/sql/*
 /test/fixtures/project/data/sqlite/*
-/test/fixtures/project/lib/model/doctrine/base/*
+/test/fixtures/project/lib/model/*
 !.gitignore
diff --git a/test/fixtures/project/lib/model/doctrine/AirCompany.class.php b/test/fixtures/project/lib/model/doctrine/AirCompany.class.php
deleted file mode 100644
index fd4eb8d..0000000
--- a/test/fixtures/project/lib/model/doctrine/AirCompany.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * AirCompany
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class AirCompany extends BaseAirCompany
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/AirCompanyTable.class.php b/test/fixtures/project/lib/model/doctrine/AirCompanyTable.class.php
deleted file mode 100644
index fe027b1..0000000
--- a/test/fixtures/project/lib/model/doctrine/AirCompanyTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * AirCompanyTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class AirCompanyTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object AirCompanyTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('AirCompany');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/Article.class.php b/test/fixtures/project/lib/model/doctrine/Article.class.php
deleted file mode 100644
index 8bdf64d..0000000
--- a/test/fixtures/project/lib/model/doctrine/Article.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Article
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class Article extends BaseArticle
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/ArticleTable.class.php b/test/fixtures/project/lib/model/doctrine/ArticleTable.class.php
deleted file mode 100644
index 1a0eea6..0000000
--- a/test/fixtures/project/lib/model/doctrine/ArticleTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * ArticleTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class ArticleTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object ArticleTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('Article');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/BlogPost.class.php b/test/fixtures/project/lib/model/doctrine/BlogPost.class.php
deleted file mode 100644
index a437bee..0000000
--- a/test/fixtures/project/lib/model/doctrine/BlogPost.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * BlogPost
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 6716 2009-11-12 19:26:28Z jwage $
- */
-class BlogPost extends BaseBlogPost
-{
-  public function getUnknownTemplate ()
-  {
-    return $this->getTempleteWithInvoker('UnknownTemplate', 'callMe');
-  }
-}
diff --git a/test/fixtures/project/lib/model/doctrine/BlogPostComment.class.php b/test/fixtures/project/lib/model/doctrine/BlogPostComment.class.php
deleted file mode 100644
index 9964f72..0000000
--- a/test/fixtures/project/lib/model/doctrine/BlogPostComment.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * BlogPostComment
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 6716 2009-11-12 19:26:28Z jwage $
- */
-class BlogPostComment extends BaseBlogPostComment
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/BlogPostCommentTable.class.php b/test/fixtures/project/lib/model/doctrine/BlogPostCommentTable.class.php
deleted file mode 100644
index 420e1bd..0000000
--- a/test/fixtures/project/lib/model/doctrine/BlogPostCommentTable.class.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-class BlogPostCommentTable extends Doctrine_Table
-{
-  /**
-   * Returns BlogPostCommentTable instance
-   *
-   * @return BlogPostCommentTable
-   */
-  public static function getInstance ()
-  {
-    return Doctrine::getTable('BlogPostComment');
-  }
-
-  /**
-   * Initialize new Doctrine_Query instance or clones if $q is passed
-   *
-   * @param null|Doctrine_Query $q optional
-   * @return Doctrine_Query
-   */
-  private function createQueryIfNull (Doctrine_Query $q = null)
-  {
-    return is_null($q) ? self::getInstance()->createQuery('bpc') : clone $q;
-  }
-
-  /**
-   * Adds all BlogPostCommentTable columns to the query
-   *
-   * @param Doctrine_Query $q
-   * @return {$TableName}Table
-   */
-  public function addSelectTableColumns (Doctrine_Query $q)
-  {
-    $q->addSelect("{$q->getRootAlias()}.*");
-
-    return $this;
-  }
-
-  /**
-   * Default getQuery method to work directly with Doctrine_Query object
-   *
-   * @param Doctrine_Query $q
-   * @return Doctrine_Query
-   */
-  public function getQuery (Doctrine_Query $q = null)
-  {
-    $q = $this->createQueryIfNull($q);
-
-    $this
-      ->addSelectTableColumns($q)
-    ;
-
-    return $q;
-  }
-
-  /**
-   * Method to fetch query with predefined filters
-   *
-   * @param Doctrine_Query $q
-   * @return BlogPostCommentTable
-   */
-  public function get (Doctrine_Query $q = null)
-  {
-    $q = $this->getQuery($q);
-
-    return $this;
-  }
-
-  
-}
diff --git a/test/fixtures/project/lib/model/doctrine/BlogPostTable.class.php b/test/fixtures/project/lib/model/doctrine/BlogPostTable.class.php
deleted file mode 100644
index 45f0570..0000000
--- a/test/fixtures/project/lib/model/doctrine/BlogPostTable.class.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-class BlogPostTable extends Doctrine_Table
-{
-  /**
-   * Returns BlogPostTable instance
-   *
-   * @return BlogPostTable
-   */
-  public static function getInstance ()
-  {
-    return Doctrine::getTable('BlogPost');
-  }
-
-  /**
-   * Initialize new Doctrine_Query instance or clones if $q is passed
-   *
-   * @param null|Doctrine_Query $q optional
-   * @return Doctrine_Query
-   */
-  private function createQueryIfNull (Doctrine_Query $q = null)
-  {
-    return is_null($q) ? self::getInstance()->createQuery('bp') : clone $q;
-  }
-
-  /**
-   * Adds all BlogPostTable columns to the query
-   *
-   * @param Doctrine_Query $q
-   * @return {$TableName}Table
-   */
-  public function addSelectTableColumns (Doctrine_Query $q)
-  {
-    $q->addSelect("{$q->getRootAlias()}.*");
-
-    return $this;
-  }
-
-  /**
-   * Adds count by foreign table as %foreign_table_name%_count column
-   *
-   * @return BlogPostCommentTable
-   */
-  public function addSelectBlogPostCommentCount (Doctrine_Query $q)
-  {
-    $subq = $q->createSubquery()
-        ->select('count(bpcc.blog_post_id)')
-        ->from('BlogPostComment bpcc')
-        ->where("{$q->getRootAlias()}.id = bpcc.blog_post_id")
-    ;
-
-    $subModelNameTableized = Doctrine_Inflector::tableize('BlogPostComment');
-
-    $q->addSelect("({$subq->getDql()}) {$subModelNameTableized}_count");
-
-    return $this;
-  }
-
-  /**
-   * Adds join to the BlogPostCommentTable and adds its columns to SELECT block
-   *
-   * @param Doctrine_Query $q
-   * @return BlogPostTable
-   */
-  public function withBlogPostComment (Doctrine_Query $q)
-  {
-    $q
-      ->addSelect('bpc.*')
-      ->leftJoin("{$q->getRootAlias()}.BlogPostComment bpc")
-    ;
-
-    return $this;
-  }
-
-
-  /**
-   *
-   * @param Doctine_Query $q
-   * @return Doctine_Query
-   */
-  public function getPostsWithCommentQuery (Doctine_Query $q = null)
-  {
-    $q = $this->getPostsQuery($q);
-
-    $this
-      ->withBlogPostComment($q)
-    ;
-
-    return $q;
-  }
-
-  /**
-   * Adds Translation table to BlogPostTable with specified culture (or system-user culture)
-   *
-   * @param Doctrine_Query $q
-   * @param string $culture Lowercased culture code
-   * @return BlogPostTable
-   */
-  public function withI18n (Doctrine_Query $q, $culture = null)
-  {
-    $culture = is_null($culture) ? sfContext::getInstance()->getUser()->getCulture() : $culture;
-
-    $q
-      ->addSelect("{$q->getRootAlias()}t.*")
-      ->leftJoin(
-        "{$q->getRootAlias()}.Translation {$q->getRootAlias()}t WITH {$q->getRootAlias()}t.lang = ?",
-        $culture
-      )
-    ;
-
-    return $this;
-  }
-
-  /**
-   *
-   * @param Doctine_Query $q
-   * @return Doctine_Query
-   */
-  public function getPostsWithCommentAndCountQuery (Doctine_Query $q = null)
-  {
-    $q = $this->getPostsQuery($q);
-
-    $this
-      ->addSelectBlogPostCommentCount($q)
-      ->withBlogPostComment($q)
-    ;
-
-    return $q;
-  }
-
-  /**
-   *
-   * @param Doctine_Query $q
-   * @return Doctine_Query
-   */
-  public function getPostsQuery (Doctine_Query $q = null)
-  {
-    $q = $this->createQueryIfNull($q);
-
-    $q->orderBy('id asc')->addWhere('is_enabled = 1');
-
-    $this
-      ->addSelectTableColumns($q)
-      ->withI18n($q)
-    ;
-
-    return $q;
-  }
-}
diff --git a/test/fixtures/project/lib/model/doctrine/BlogPostVote.class.php b/test/fixtures/project/lib/model/doctrine/BlogPostVote.class.php
deleted file mode 100644
index 0c69c09..0000000
--- a/test/fixtures/project/lib/model/doctrine/BlogPostVote.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * BlogPostVote
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class BlogPostVote extends BaseBlogPostVote
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/BlogPostVoteTable.class.php b/test/fixtures/project/lib/model/doctrine/BlogPostVoteTable.class.php
deleted file mode 100644
index 24a020f..0000000
--- a/test/fixtures/project/lib/model/doctrine/BlogPostVoteTable.class.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-
-class BlogPostVoteTable extends Doctrine_Table
-{
-    
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('BlogPostVote');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/Book.class.php b/test/fixtures/project/lib/model/doctrine/Book.class.php
deleted file mode 100644
index 0a8794a..0000000
--- a/test/fixtures/project/lib/model/doctrine/Book.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Book
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class Book extends BaseBook
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/BookTable.class.php b/test/fixtures/project/lib/model/doctrine/BookTable.class.php
deleted file mode 100644
index 92104ac..0000000
--- a/test/fixtures/project/lib/model/doctrine/BookTable.class.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-
-class BookTable extends Doctrine_Table
-{
-    
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('Book');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/Comment.class.php b/test/fixtures/project/lib/model/doctrine/Comment.class.php
deleted file mode 100644
index 3135f80..0000000
--- a/test/fixtures/project/lib/model/doctrine/Comment.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Comment
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class Comment extends BaseComment
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/CommentTable.class.php b/test/fixtures/project/lib/model/doctrine/CommentTable.class.php
deleted file mode 100644
index 7ac0ddc..0000000
--- a/test/fixtures/project/lib/model/doctrine/CommentTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * CommentTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class CommentTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object CommentTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('Comment');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/Device.class.php b/test/fixtures/project/lib/model/doctrine/Device.class.php
deleted file mode 100644
index 04e7690..0000000
--- a/test/fixtures/project/lib/model/doctrine/Device.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Device
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class Device extends BaseDevice
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/DeviceTable.class.php b/test/fixtures/project/lib/model/doctrine/DeviceTable.class.php
deleted file mode 100644
index 8f586ba..0000000
--- a/test/fixtures/project/lib/model/doctrine/DeviceTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * DeviceTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class DeviceTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object DeviceTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('Device');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/Food.class.php b/test/fixtures/project/lib/model/doctrine/Food.class.php
deleted file mode 100644
index 36ab0f4..0000000
--- a/test/fixtures/project/lib/model/doctrine/Food.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Food
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class Food extends BaseFood
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/FoodReordered.class.php b/test/fixtures/project/lib/model/doctrine/FoodReordered.class.php
deleted file mode 100644
index 53be0c8..0000000
--- a/test/fixtures/project/lib/model/doctrine/FoodReordered.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * FoodReordered
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class FoodReordered extends BaseFoodReordered
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/FoodReorderedTable.class.php b/test/fixtures/project/lib/model/doctrine/FoodReorderedTable.class.php
deleted file mode 100644
index 1ea2cf6..0000000
--- a/test/fixtures/project/lib/model/doctrine/FoodReorderedTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * FoodReorderedTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class FoodReorderedTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object FoodReorderedTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('FoodReordered');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/FoodTable.class.php b/test/fixtures/project/lib/model/doctrine/FoodTable.class.php
deleted file mode 100644
index 69e7802..0000000
--- a/test/fixtures/project/lib/model/doctrine/FoodTable.class.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-
-class FoodTable extends Doctrine_Table
-{
-    
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('Food');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/PostVote.class.php b/test/fixtures/project/lib/model/doctrine/PostVote.class.php
deleted file mode 100644
index 9182145..0000000
--- a/test/fixtures/project/lib/model/doctrine/PostVote.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * PostVote
- *
- * This class has been auto-generated by the Doctrine ORM Framework
- *
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class PostVote extends BasePostVote
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/PostVoteTable.class.php b/test/fixtures/project/lib/model/doctrine/PostVoteTable.class.php
deleted file mode 100644
index 9ebaf2b..0000000
--- a/test/fixtures/project/lib/model/doctrine/PostVoteTable.class.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-
-class PostVoteTable extends Doctrine_Table
-{
-    
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('PostVote');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/RelCategory.class.php b/test/fixtures/project/lib/model/doctrine/RelCategory.class.php
deleted file mode 100644
index fc56642..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelCategory.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * RelCategory
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class RelCategory extends BaseRelCategory
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/RelCategoryTable.class.php b/test/fixtures/project/lib/model/doctrine/RelCategoryTable.class.php
deleted file mode 100644
index 0b080d9..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelCategoryTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * RelCategoryTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class RelCategoryTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object RelCategoryTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('RelCategory');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/RelCulture.class.php b/test/fixtures/project/lib/model/doctrine/RelCulture.class.php
deleted file mode 100644
index 1b92b61..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelCulture.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * RelCulture
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class RelCulture extends BaseRelCulture
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/RelCultureTable.class.php b/test/fixtures/project/lib/model/doctrine/RelCultureTable.class.php
deleted file mode 100644
index 49dc31a..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelCultureTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * RelCultureTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class RelCultureTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object RelCultureTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('RelCulture');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/RelSite.class.php b/test/fixtures/project/lib/model/doctrine/RelSite.class.php
deleted file mode 100644
index 1aa456f..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelSite.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * RelSite
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class RelSite extends BaseRelSite
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/RelSiteCulture.class.php b/test/fixtures/project/lib/model/doctrine/RelSiteCulture.class.php
deleted file mode 100644
index e5183b6..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelSiteCulture.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * RelSiteCulture
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class RelSiteCulture extends BaseRelSiteCulture
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/RelSiteCultureTable.class.php b/test/fixtures/project/lib/model/doctrine/RelSiteCultureTable.class.php
deleted file mode 100644
index 4fededf..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelSiteCultureTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * RelSiteCultureTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class RelSiteCultureTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object RelSiteCultureTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('RelSiteCulture');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/RelSiteSetting.class.php b/test/fixtures/project/lib/model/doctrine/RelSiteSetting.class.php
deleted file mode 100644
index a6f2058..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelSiteSetting.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * RelSiteSetting
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class RelSiteSetting extends BaseRelSiteSetting
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/RelSiteSettingTable.class.php b/test/fixtures/project/lib/model/doctrine/RelSiteSettingTable.class.php
deleted file mode 100644
index a949390..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelSiteSettingTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * RelSiteSettingTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class RelSiteSettingTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return RelSiteSettingTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('RelSiteSetting');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/RelSiteTable.class.php b/test/fixtures/project/lib/model/doctrine/RelSiteTable.class.php
deleted file mode 100644
index 6d0980e..0000000
--- a/test/fixtures/project/lib/model/doctrine/RelSiteTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * RelSiteTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class RelSiteTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return RelSiteTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('RelSite');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/Repository.class.php b/test/fixtures/project/lib/model/doctrine/Repository.class.php
deleted file mode 100644
index 80e4c10..0000000
--- a/test/fixtures/project/lib/model/doctrine/Repository.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Repository
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class Repository extends BaseRepository
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/RepositoryTable.class.php b/test/fixtures/project/lib/model/doctrine/RepositoryTable.class.php
deleted file mode 100644
index f9ff56a..0000000
--- a/test/fixtures/project/lib/model/doctrine/RepositoryTable.class.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-
-class RepositoryTable extends Doctrine_Table
-{
-    
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('Repository');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/SkipOnColumnUpdateTest.class.php b/test/fixtures/project/lib/model/doctrine/SkipOnColumnUpdateTest.class.php
deleted file mode 100644
index 44b3478..0000000
--- a/test/fixtures/project/lib/model/doctrine/SkipOnColumnUpdateTest.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * SkipOnColumnUpdateTest
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class SkipOnColumnUpdateTest extends BaseSkipOnColumnUpdateTest
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/SkipOnColumnUpdateTestTable.class.php b/test/fixtures/project/lib/model/doctrine/SkipOnColumnUpdateTestTable.class.php
deleted file mode 100644
index 3629081..0000000
--- a/test/fixtures/project/lib/model/doctrine/SkipOnColumnUpdateTestTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * SkipOnColumnUpdateTestTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class SkipOnColumnUpdateTestTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object SkipOnColumnUpdateTestTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('SkipOnColumnUpdateTest');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/Tree.class.php b/test/fixtures/project/lib/model/doctrine/Tree.class.php
deleted file mode 100644
index 7581d72..0000000
--- a/test/fixtures/project/lib/model/doctrine/Tree.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Tree
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class Tree extends BaseTree
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/TreeTable.class.php b/test/fixtures/project/lib/model/doctrine/TreeTable.class.php
deleted file mode 100644
index d18e333..0000000
--- a/test/fixtures/project/lib/model/doctrine/TreeTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * TreeTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class TreeTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object TreeTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('Tree');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/University.class.php b/test/fixtures/project/lib/model/doctrine/University.class.php
deleted file mode 100644
index 6c94bdc..0000000
--- a/test/fixtures/project/lib/model/doctrine/University.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * University
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class University extends BaseUniversity
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/UniversityTable.class.php b/test/fixtures/project/lib/model/doctrine/UniversityTable.class.php
deleted file mode 100644
index 4f68528..0000000
--- a/test/fixtures/project/lib/model/doctrine/UniversityTable.class.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-
-class UniversityTable extends Doctrine_Table
-{
-    
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('University');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/Weapon.class.php b/test/fixtures/project/lib/model/doctrine/Weapon.class.php
deleted file mode 100644
index f8232cc..0000000
--- a/test/fixtures/project/lib/model/doctrine/Weapon.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Weapon
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    sfCacheTaggingPlugin
- * @subpackage model
- * @author     Your name here
- * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
- */
-class Weapon extends BaseWeapon
-{
-}
diff --git a/test/fixtures/project/lib/model/doctrine/WeaponTable.class.php b/test/fixtures/project/lib/model/doctrine/WeaponTable.class.php
deleted file mode 100644
index b7ac506..0000000
--- a/test/fixtures/project/lib/model/doctrine/WeaponTable.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * WeaponTable
- * 
- * This class has been auto-generated by the Doctrine ORM Framework
- */
-class WeaponTable extends Doctrine_Table
-{
-    /**
-     * Returns an instance of this class.
-     *
-     * @return object WeaponTable
-     */
-    public static function getInstance()
-    {
-        return Doctrine_Core::getTable('Weapon');
-    }
-}
\ No newline at end of file
diff --git a/test/fixtures/project/lib/model/doctrine/base/.gitignore b/test/fixtures/project/lib/model/doctrine/base/.gitignore
deleted file mode 100644
index e69de29..0000000