Added cleaner makefile structure and doxygen