FIXed rest of namespaces and added DoctrineSource for Doctrine 2