Reworking Design, doc. with doxygen