move journal-gateway to subpackage