Why are there separate convectiondiffusion.hh and convectiondiffusionfem.hh?

The two seem to do the same, but convectiondiffusionfem.hh is the more complete implementation.

Should we deprecate the version in convectiondiffusion.hh?