Now including the source dirs as well