Fix up injected handlers.
Moved some classes.
Added some notes on the injecting handler.
move.
More spec fixing.