Reorganised structure of Doctrine model implementation.