Doctrine Annotations separation

Not ready to merge yet, I've to update the documentation as well. Ready to review though.