Replace all three bad_behavior directory (from BB1) with the ones from BB2.
Bad Behaviour does not replace Spam-X. BB1 shipped with a Spam-X module (that you were supposed to copy into your plugins/spamx directory). That module isn't needed (and doesn't work) any more, so remove it.
bye, Dirk