added folders?
changed mergemonster in a big way