Move trace/ to somewhere more sensible.