Separated Doctrine to Kappa\Doctrine