a little refactoring for my sins

- break circular build dependency between src/ and toolsrc/ (how DID I
ever get this to compile??)
- less URI<->File round-tripping
- slightly better method names