Improved Doxygen structure.