Refactor of include dir
Merge pull request #3 from n8paul19/pilot

Refactor of include dir