Merge Flame\Model and Flame\Doctrine