Redo a the dependency module a bit

Probably still not 'right' but dependency singleton may be a bit much
for such a small project, so I'm going to move away from that.