Remove unused macros
Header rename
Split benchmark.c into two files
Refactoring
More file splitting