[WIP] Move files into consolidated Doctrine plugin

Very much work in progress on though on consolidating the different Doctrine plugins into one.