Refactor of include dir