Revert directory fixes. Fix Doxyfile naming.