added dsl source folders and changed include mechanism