Reorganize, but it doesn't build
moved kv_heap back, cleaned up scons
fixed updateWithDamages message