We don't need pid here anyway, since we're just passing on counters for the system itself.
The lib/ directory was getting a bit out of hand, so this tries to organize things a bit so it is easier going forward to locate the code people want to patch.
