Refactor to use an include/ directory