One more import fix in a helper binary
Source tree reorganization

Use src/ for the library and tools/ for binaries.