Organized imports in GatewayManager