Directory scanner and file includers added