Refactor the header files and `make copy`