add doctrine modules
remove not need modules
Merge branch 'non_tracking'