Closing doxygen groups

Remove some Doxygen warning by closing groups.