Reorganize code (because ClojureScript), deeper traces