More Doxygen-compatible documentation. Also unified two identical structures.