Changed design a bit
Moved doxygen out of cloc requirement