Some minor fixes

* In Dereferencing, do build a canonical tree when using canonical
  dereferencing!
* Remove the 2 in {Json,Schema}Tree2 and derivates
* Reorganize imports

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>