Double walk

signature scan separated from file list gathering