Clean up include path

This makes the code more readable and makes the program architecture
easier to extend.
Update contributors' name