I think that code should be included in the main lib, it should be found an appropriate location and stay there.