+ added folders and initial search and replace