Fix merge traces and move unicorn stuff to its own directory.