consolidate doctrine listeners and move to Doctrine directory