reorganization of composition to massroute-driver for clearer separation of module factory responsibilities.