BACKLOG-3706: Convert Gateway module to bundle