Fixes James' problems.

Corrects autoload.
`needle` always comes before `haystack`.
Adds `ht2/` to namespace.