Refactored, all headers are in include and not in src