yes, just moving.  there's not supposed to be any functional change in this branch.

definitely want both.  blueprint here: http://wagn.org/commenting_overhaul