Merge include and source folders