Relocate include directory
A little code cleanup