oops not necessary
Turns out exportTree's return value isn't served

So we merge them instead
Refactor stuff b/c lots of files

Fixes #1