As in stats tracker, move ABCs to the modules with their implementations and give these modules a bit more sane names