Updated to support multiple source directories