Rearranged options.h to generate correct doxygen doc