Repository: knative-sandbox/eventing-kafka
Pull request #53 (2020-09-14 19:56:19)

Repo consolidation
This PR represents an initial attempt at restructuring the `eventing-kafka` repository to make room for the Kafka related implementations (channel, source, webhook) from the `eventing-contrib` repository.  It is a proposal only and feedback is welcome.

There are lot of changes in the PR, but mostly it's just changing imports to align with the new structure.  The following image gives an overview of the directory organization / naming...
```
~/Workspace/GO/src/knative.dev/eventing-kafka> tree -d -L 3 cmd config pkg
cmd
├── channel
│   ├── consolidated
│   └── distributed
│       ├── controller
│       ├── dispatcher
│       └── receiver
├── source
└── webhook

config
├── channel
│   ├── consolidated
│   └── distributed
├── source
└── webhook

pkg
├── channel
│   ├── apis
│   ├── client
│   ├── consolidated
│   └── distributed
│       ├── build
│       ├── common
│       ├── controller
│       ├── dispatcher
│       ├── hack
│       └── receiver
└── source
```

Specifically, the following questions should be considered...
-  **Channel Naming** - The `eventing-contrib` channel implementation is re-named `consolidated`, and the `eventing-kafka` implementation is re-named `distributed`.  Admittedly these aren't the best descriptors but the intent is to provide something to describe the difference in the architectural approach between the two implementations.  We shouldn't rely on their origin or history when naming them here, as that will be meaningless for new/future users of the implementations. 
- **config/ Location** - Confirm that we want to keep the config at the top as is shown or to bury it down next to the pkg/channel/distributed directory?
- **apis/ & client/ Location** - Confirm that we want to keep these dirs under `pkg/channel` instead of just at `pkg/`?


/hold

knative-prow-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka/pull/53#" title="Author self-approved">travis-minke-sap</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=knative-sandbox%2Feventing-kafka).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/knative-sandbox/eventing-kafka/blob/master/OWNERS)~~ [travis-minke-sap]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
knative-prow-robot: @travis-minke-sap: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-build-tests | d42356d236cd8d013b45a026ea3f93d039065bbd | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-build-tests/1305596408174219264) | `/test pull-knative-sandbox-eventing-kafka-build-tests`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/53). [Your PR dashboard](https://gubernator.knative.dev/pr/travis-minke-sap).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-prow-robot: @travis-minke-sap: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-build-tests | d42356d236cd8d013b45a026ea3f93d039065bbd | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-build-tests/1305596408174219264) | `/test pull-knative-sandbox-eventing-kafka-build-tests`
pull-knative-sandbox-eventing-kafka-go-coverage | d42356d236cd8d013b45a026ea3f93d039065bbd | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305596408178413569) | `/test pull-knative-sandbox-eventing-kafka-go-coverage`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/53). [Your PR dashboard](https://gubernator.knative.dev/pr/travis-minke-sap).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-metrics-robot: The following is the coverage report on the affected files.
Say `/test pull-knative-sandbox-eventing-kafka-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/channel/distributed/common/config/configwatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file0) | Do not exist | 54.5% | 
[pkg/channel/distributed/common/config/observability.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file1) | Do not exist | 64.0% | 
[pkg/channel/distributed/common/config/tracing.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file2) | Do not exist | 84.6% | 
[pkg/channel/distributed/common/env/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file3) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file4) | Do not exist | 92.5% | 
[pkg/channel/distributed/common/k8s/context.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file5) | Do not exist | 60.0% | 
[pkg/channel/distributed/common/k8s/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file6) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/admin.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file7) | Do not exist | 55.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_custom.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file8) | Do not exist | 72.2% | 
[pkg/channel/distributed/common/kafka/admin/admin_eventhub.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file9) | Do not exist | 88.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_kafka.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file10) | Do not exist | 83.3% | 
[pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file11) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file12) | Do not exist | 78.6% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file13) | Do not exist | 0.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file14) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file15) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/consumer/consumer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file16) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file17) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/sarama/sarama.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file18) | Do not exist | 80.5% | 
[pkg/channel/distributed/common/kafka/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file19) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/metrics/stats_reporter.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file20) | Do not exist | 75.0% | 
[pkg/channel/distributed/common/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file21) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file22) | Do not exist | 95.0% | 
[pkg/channel/distributed/controller/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file23) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/event/event.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file24) | Do not exist | 94.1% | 
[pkg/channel/distributed/controller/kafkachannel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file25) | Do not exist | 91.4% | 
[pkg/channel/distributed/controller/kafkachannel/controller.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file26) | Do not exist | 0.0% | 
[pkg/channel/distributed/controller/kafkachannel/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file27) | Do not exist | 86.1% | 
[pkg/channel/distributed/controller/kafkachannel/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file28) | Do not exist | 81.4% | 
[pkg/channel/distributed/controller/kafkachannel/reconciler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file29) | Do not exist | 70.3% | 
[pkg/channel/distributed/controller/kafkachannel/topic.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file30) | Do not exist | 79.5% | 
[pkg/channel/distributed/controller/kafkasecret/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file31) | Do not exist | 86.7% | 
[pkg/channel/distributed/controller/kafkasecret/controller.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file32) | Do not exist | 0.0% | 
[pkg/channel/distributed/controller/kafkasecret/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file33) | Do not exist | 71.1% | 
[pkg/channel/distributed/controller/kafkasecret/reconciler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file34) | Do not exist | 90.5% | 
[pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file35) | Do not exist | 76.9% | 
[pkg/channel/distributed/controller/util/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file36) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file37) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/dns.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file38) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/finalizer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file39) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/secret.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file40) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/subscription.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file41) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/topic.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file42) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file43) | Do not exist | 69.2% | 
[pkg/channel/distributed/dispatcher/controller/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file44) | Do not exist | 79.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file45) | Do not exist | 85.1% | 
[pkg/channel/distributed/dispatcher/dispatcher/handler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file46) | Do not exist | 90.9% | 
[pkg/channel/distributed/dispatcher/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file47) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file48) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/channel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file49) | Do not exist | 71.1% | 
[pkg/channel/distributed/receiver/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file50) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file51) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file52) | Do not exist | 76.8% | 
[pkg/channel/distributed/receiver/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704/artifacts/line-cov.html#file53) | Do not exist | 100.0% | 

knative-prow-robot: @travis-minke-sap: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-go-coverage | de3dc1798f3bb9eb4af3c78b1825340a3c2cf6c4 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305598547206344704) | `/test pull-knative-sandbox-eventing-kafka-go-coverage`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/53). [Your PR dashboard](https://gubernator.knative.dev/pr/travis-minke-sap).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
lgtm-com[bot]: This pull request **introduces 11 alerts** and **fixes 11** when merging de3dc1798f3bb9eb4af3c78b1825340a3c2cf6c4 into a2a9e1beed88f70f24128044f40c0ff6d177e6f8 - [view on LGTM.com](https://lgtm.com/projects/g/knative-sandbox/eventing-kafka/rev/pr-97e415a96aeb7e8e0b15b1551f61b1edd915e69d)

**new alerts:**

* 11 for Useless assignment to local variable

**fixed alerts:**

* 11 for Useless assignment to local variable
knative-metrics-robot: The following is the coverage report on the affected files.
Say `/test pull-knative-sandbox-eventing-kafka-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/channel/distributed/common/config/configwatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file0) | Do not exist | 54.5% | 
[pkg/channel/distributed/common/config/observability.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file1) | Do not exist | 64.0% | 
[pkg/channel/distributed/common/config/tracing.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file2) | Do not exist | 84.6% | 
[pkg/channel/distributed/common/env/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file3) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file4) | Do not exist | 92.5% | 
[pkg/channel/distributed/common/k8s/context.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file5) | Do not exist | 60.0% | 
[pkg/channel/distributed/common/k8s/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file6) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/admin.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file7) | Do not exist | 55.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_custom.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file8) | Do not exist | 72.2% | 
[pkg/channel/distributed/common/kafka/admin/admin_eventhub.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file9) | Do not exist | 88.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_kafka.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file10) | Do not exist | 83.3% | 
[pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file11) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file12) | Do not exist | 78.6% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file13) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file14) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file15) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/consumer/consumer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file16) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file17) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/sarama/sarama.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file18) | Do not exist | 80.5% | 
[pkg/channel/distributed/common/kafka/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file19) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/metrics/stats_reporter.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file20) | Do not exist | 75.0% | 
[pkg/channel/distributed/common/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file21) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file22) | Do not exist | 95.0% | 
[pkg/channel/distributed/controller/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file23) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/event/event.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file24) | Do not exist | 94.1% | 
[pkg/channel/distributed/controller/kafkachannel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file25) | Do not exist | 91.4% | 
[pkg/channel/distributed/controller/kafkachannel/controller.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file26) | Do not exist | 0.0% | 
[pkg/channel/distributed/controller/kafkachannel/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file27) | Do not exist | 86.1% | 
[pkg/channel/distributed/controller/kafkachannel/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file28) | Do not exist | 81.4% | 
[pkg/channel/distributed/controller/kafkachannel/reconciler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file29) | Do not exist | 70.3% | 
[pkg/channel/distributed/controller/kafkachannel/topic.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file30) | Do not exist | 79.5% | 
[pkg/channel/distributed/controller/kafkasecret/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file31) | Do not exist | 86.7% | 
[pkg/channel/distributed/controller/kafkasecret/controller.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file32) | Do not exist | 0.0% | 
[pkg/channel/distributed/controller/kafkasecret/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file33) | Do not exist | 71.1% | 
[pkg/channel/distributed/controller/kafkasecret/reconciler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file34) | Do not exist | 90.5% | 
[pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file35) | Do not exist | 76.9% | 
[pkg/channel/distributed/controller/util/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file36) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file37) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/dns.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file38) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/finalizer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file39) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/secret.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file40) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/subscription.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file41) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/topic.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file42) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file43) | Do not exist | 69.2% | 
[pkg/channel/distributed/dispatcher/controller/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file44) | Do not exist | 79.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file45) | Do not exist | 78.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/handler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file46) | Do not exist | 90.9% | 
[pkg/channel/distributed/dispatcher/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file47) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file48) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/channel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file49) | Do not exist | 71.1% | 
[pkg/channel/distributed/receiver/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file50) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file51) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file52) | Do not exist | 76.8% | 
[pkg/channel/distributed/receiver/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563/artifacts/line-cov.html#file53) | Do not exist | 100.0% | 

knative-prow-robot: @travis-minke-sap: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-go-coverage | 41f3a2b119d7ac4b21a07280dce3da777a99251c | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305605215788994563) | `/test pull-knative-sandbox-eventing-kafka-go-coverage`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/53). [Your PR dashboard](https://gubernator.knative.dev/pr/travis-minke-sap).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-metrics-robot: The following is the coverage report on the affected files.
Say `/test pull-knative-sandbox-eventing-kafka-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/channel/distributed/common/config/configwatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file0) | Do not exist | 54.5% | 
[pkg/channel/distributed/common/config/observability.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file1) | Do not exist | 64.0% | 
[pkg/channel/distributed/common/config/tracing.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file2) | Do not exist | 84.6% | 
[pkg/channel/distributed/common/env/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file3) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file4) | Do not exist | 92.5% | 
[pkg/channel/distributed/common/k8s/context.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file5) | Do not exist | 60.0% | 
[pkg/channel/distributed/common/k8s/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file6) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/admin.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file7) | Do not exist | 55.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_custom.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file8) | Do not exist | 72.2% | 
[pkg/channel/distributed/common/kafka/admin/admin_eventhub.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file9) | Do not exist | 88.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_kafka.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file10) | Do not exist | 83.3% | 
[pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file11) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file12) | Do not exist | 78.6% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file13) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file14) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file15) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/consumer/consumer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file16) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file17) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/sarama/sarama.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file18) | Do not exist | 80.5% | 
[pkg/channel/distributed/common/kafka/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file19) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/metrics/stats_reporter.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file20) | Do not exist | 75.0% | 
[pkg/channel/distributed/common/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file21) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file22) | Do not exist | 95.0% | 
[pkg/channel/distributed/controller/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file23) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/event/event.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file24) | Do not exist | 94.1% | 
[pkg/channel/distributed/controller/kafkachannel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file25) | Do not exist | 91.4% | 
[pkg/channel/distributed/controller/kafkachannel/controller.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file26) | Do not exist | 0.0% | 
[pkg/channel/distributed/controller/kafkachannel/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file27) | Do not exist | 86.1% | 
[pkg/channel/distributed/controller/kafkachannel/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file28) | Do not exist | 81.4% | 
[pkg/channel/distributed/controller/kafkachannel/reconciler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file29) | Do not exist | 70.3% | 
[pkg/channel/distributed/controller/kafkachannel/topic.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file30) | Do not exist | 79.5% | 
[pkg/channel/distributed/controller/kafkasecret/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file31) | Do not exist | 86.7% | 
[pkg/channel/distributed/controller/kafkasecret/controller.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file32) | Do not exist | 0.0% | 
[pkg/channel/distributed/controller/kafkasecret/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file33) | Do not exist | 71.1% | 
[pkg/channel/distributed/controller/kafkasecret/reconciler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file34) | Do not exist | 90.5% | 
[pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file35) | Do not exist | 76.9% | 
[pkg/channel/distributed/controller/util/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file36) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file37) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/dns.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file38) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/finalizer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file39) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/secret.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file40) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/subscription.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file41) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/topic.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file42) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file43) | Do not exist | 69.2% | 
[pkg/channel/distributed/dispatcher/controller/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file44) | Do not exist | 79.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file45) | Do not exist | 78.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/handler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file46) | Do not exist | 90.9% | 
[pkg/channel/distributed/dispatcher/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file47) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file48) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/channel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file49) | Do not exist | 71.1% | 
[pkg/channel/distributed/receiver/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file50) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file51) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file52) | Do not exist | 76.8% | 
[pkg/channel/distributed/receiver/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089/artifacts/line-cov.html#file53) | Do not exist | 100.0% | 

knative-prow-robot: @travis-minke-sap: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-go-coverage | 76e6cfeea574db1d401470ee88e06db922e52303 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1305606348175577089) | `/test pull-knative-sandbox-eventing-kafka-go-coverage`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/53). [Your PR dashboard](https://gubernator.knative.dev/pr/travis-minke-sap).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
lgtm-com[bot]: This pull request **introduces 11 alerts** and **fixes 11** when merging 76e6cfeea574db1d401470ee88e06db922e52303 into a2a9e1beed88f70f24128044f40c0ff6d177e6f8 - [view on LGTM.com](https://lgtm.com/projects/g/knative-sandbox/eventing-kafka/rev/pr-c3bb1e3790337cdd00530a042fcec41cdc72c1fc)

**new alerts:**

* 11 for Useless assignment to local variable

**fixed alerts:**

* 11 for Useless assignment to local variable
slinkydeveloper: @travis-minke-sap this reorg sounds good to me, waiting for @matzew @lberk and @aliok opinion :smile: 

/lgtm
aliok: > Channel Naming 

I don't have a strong opinion. It is hard to name things... In the long run, are we going to merge these 2 channels? If not, what happens if we want to have `eventing-contrib` kafka channel as a distributed one too?

> config/ Location - Confirm that we want to keep the config at the top as is shown or to bury it down next to the pkg/channel/distributed directory?

IMO better keeping this way instead of burying. Easier to do `ko apply` :)

> apis/ & client/ Location - Confirm that we want to keep these dirs under pkg/channel instead of just at pkg/?

Sounds good to me.

/lgtm
pierDipi: I would suggest changing from
```
pkg
├── channel
│   ├── apis
│   ├── client
│   ├── consolidated
│   └── distributed
│       ├── build
│       ├── common
│       ├── controller
│       ├── dispatcher
│       ├── hack
│       └── receiver
└── source
```
to 
```
pkg
├── apis
     ├── messaging
     ├── sources
├── client   
├── channel (impl)
│   ├── consolidated
│   └── distributed
│       ├── build
│       ├── common
│       ├── controller
│       ├── dispatcher
│       ├── hack
│       └── receiver
└── source (impl)
```
Since the injection thing is documented in pkg: https://github.com/knative/pkg/tree/master/injection and it uses `pkg/apis` and `pkg/client`. 
travis-minke-sap: Thanks everyone for their feedback - I'll reply to it all inline here...

@aliok - Agreed naming is hard ; ).  I've heard differing opinions as to whether the long term plan will be to merge the two implementations, or to have them live on side-by-side offering different runtime characteristics.  We'll have to see where that road leads.  I would think, though, that if the eventing-contrib/kafka (consolidated) were to become "distributed", then we'd be merging them since that is the primary architectural difference.  I'm not 100% sold on the naming but don't have anything better so for now (to get started) we'll go with that ; )

@pierDipi - Thanks for the information, I'd not been involved in generating the `apis/` or `client/` on the knative side as of yet - so I'm happy to move them up under `pkg/` if that's where they belong.

@matzew - (from slack thread) Yeah, the new `common/` dirs aren't shown and can be created at whatever level we need/want when we start integrating.  For now I'd kept our sandbox/eventing-kafka `common/` under `distributed` to get started and we can move/share things as makes sense going forward.  Also, we can move `config/webhook` under `config/channel/webhook` if that is preferable.

I'm working through the quality gates on this PR which flagged a bunch of new stuff since it's treating every file as "new" and found a couple unit-test gaps (the hard-to-test controller construction ; )  and should have the PR ready/passing in the next couple days depending on other commitments.

Once it's passable we can merge and then it will be ready to start migrating eventing-contrib/kafka components in as makes sense.  Thanks again everyone!
matzew: I like the `pkg/api` and `pkg/client` folder suggestion 
matzew: > I don't have a strong opinion. It is hard to name things... In the long run, are we going to merge these 2 channels? If not, what
> happens if we want to have eventing-contrib kafka channel as a distributed one too?

the short story is: both get into this repo.  we than start seeing to share (common) code, like API shape for the channels.

Over time, the goal is - I guess - to have one solid channel w/ concepts from both worlds - if feasable / or configurable 
 
matzew: I think to make migration easier, I can start to "flatten" the contrib repo to a structure like:

```
kafka
  cmd
     channel
     source
     webhook
  config/
     channel
     source
  pkg 
```

Any comments?
knative-prow-robot: New changes are detected. LGTM label has been removed.
knative-prow-robot: @travis-minke-sap: PR needs rebase.

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>
knative-metrics-robot: The following is the coverage report on the affected files.
Say `/test pull-knative-sandbox-eventing-kafka-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/channel/distributed/common/config/configwatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file0) | Do not exist | 54.5% | 
[pkg/channel/distributed/common/config/observability.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file1) | Do not exist | 64.0% | 
[pkg/channel/distributed/common/config/tracing.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file2) | Do not exist | 84.6% | 
[pkg/channel/distributed/common/env/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file3) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file4) | Do not exist | 92.5% | 
[pkg/channel/distributed/common/k8s/context.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file5) | Do not exist | 60.0% | 
[pkg/channel/distributed/common/k8s/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file6) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/admin.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file7) | Do not exist | 55.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_custom.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file8) | Do not exist | 72.2% | 
[pkg/channel/distributed/common/kafka/admin/admin_eventhub.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file9) | Do not exist | 88.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_kafka.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file10) | Do not exist | 83.3% | 
[pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file11) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file12) | Do not exist | 78.6% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file13) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file14) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file15) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/consumer/consumer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file16) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file17) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/sarama/sarama.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file18) | Do not exist | 80.5% | 
[pkg/channel/distributed/common/kafka/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file19) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/metrics/stats_reporter.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file20) | Do not exist | 75.0% | 
[pkg/channel/distributed/common/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file21) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file22) | Do not exist | 95.0% | 
[pkg/channel/distributed/controller/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file23) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/event/event.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file24) | Do not exist | 94.1% | 
[pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file25) | Do not exist | 76.9% | 
[pkg/channel/distributed/dispatcher/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file26) | Do not exist | 69.2% | 
[pkg/channel/distributed/dispatcher/controller/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file27) | Do not exist | 79.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file28) | Do not exist | 85.1% | 
[pkg/channel/distributed/dispatcher/dispatcher/handler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file29) | Do not exist | 90.9% | 
[pkg/channel/distributed/dispatcher/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file30) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file31) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/channel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file32) | Do not exist | 71.1% | 
[pkg/channel/distributed/receiver/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file33) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file34) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file35) | Do not exist | 76.8% | 
[pkg/channel/distributed/receiver/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306253276936671238/artifacts/line-cov.html#file36) | Do not exist | 100.0% | 

knative-prow-robot: @travis-minke-sap: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-unit-tests | 72def3f3d3f2278539b1ef11a7aace9ec0c6a1b3 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-unit-tests/1306253276936671241) | `/test pull-knative-sandbox-eventing-kafka-unit-tests`
pull-knative-sandbox-eventing-kafka-build-tests | b2caaaf5571108be022ca4117093801675b7bac3 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-build-tests/1306254913105301507) | `/test pull-knative-sandbox-eventing-kafka-build-tests`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/53). [Your PR dashboard](https://gubernator.knative.dev/pr/travis-minke-sap).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-metrics-robot: The following is the coverage report on the affected files.
Say `/test pull-knative-sandbox-eventing-kafka-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/channel/distributed/common/config/configwatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file0) | Do not exist | 54.5% | 
[pkg/channel/distributed/common/config/observability.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file1) | Do not exist | 64.0% | 
[pkg/channel/distributed/common/config/tracing.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file2) | Do not exist | 84.6% | 
[pkg/channel/distributed/common/env/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file3) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file4) | Do not exist | 92.5% | 
[pkg/channel/distributed/common/k8s/context.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file5) | Do not exist | 60.0% | 
[pkg/channel/distributed/common/k8s/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file6) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/admin.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file7) | Do not exist | 55.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_custom.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file8) | Do not exist | 72.2% | 
[pkg/channel/distributed/common/kafka/admin/admin_eventhub.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file9) | Do not exist | 88.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_kafka.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file10) | Do not exist | 83.3% | 
[pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file11) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file12) | Do not exist | 78.6% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file13) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file14) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file15) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/consumer/consumer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file16) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file17) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/sarama/sarama.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file18) | Do not exist | 80.5% | 
[pkg/channel/distributed/common/kafka/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file19) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/metrics/stats_reporter.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file20) | Do not exist | 75.0% | 
[pkg/channel/distributed/common/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file21) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file22) | Do not exist | 95.0% | 
[pkg/channel/distributed/controller/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file23) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/event/event.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file24) | Do not exist | 94.1% | 
[pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file25) | Do not exist | 76.9% | 
[pkg/channel/distributed/dispatcher/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file26) | Do not exist | 69.2% | 
[pkg/channel/distributed/dispatcher/controller/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file27) | Do not exist | 79.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file28) | Do not exist | 85.1% | 
[pkg/channel/distributed/dispatcher/dispatcher/handler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file29) | Do not exist | 90.9% | 
[pkg/channel/distributed/dispatcher/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file30) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file31) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/channel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file32) | Do not exist | 71.1% | 
[pkg/channel/distributed/receiver/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file33) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file34) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file35) | Do not exist | 76.8% | 
[pkg/channel/distributed/receiver/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306254913105301506/artifacts/line-cov.html#file36) | Do not exist | 100.0% | 

knative-metrics-robot: The following is the coverage report on the affected files.
Say `/test pull-knative-sandbox-eventing-kafka-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/channel/distributed/common/config/configwatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file0) | Do not exist | 54.5% | 
[pkg/channel/distributed/common/config/observability.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file1) | Do not exist | 64.0% | 
[pkg/channel/distributed/common/config/tracing.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file2) | Do not exist | 84.6% | 
[pkg/channel/distributed/common/env/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file3) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file4) | Do not exist | 92.5% | 
[pkg/channel/distributed/common/k8s/context.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file5) | Do not exist | 60.0% | 
[pkg/channel/distributed/common/k8s/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file6) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/admin.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file7) | Do not exist | 55.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_custom.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file8) | Do not exist | 72.2% | 
[pkg/channel/distributed/common/kafka/admin/admin_eventhub.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file9) | Do not exist | 88.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_kafka.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file10) | Do not exist | 83.3% | 
[pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file11) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file12) | Do not exist | 77.1% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file13) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file14) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file15) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/consumer/consumer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file16) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file17) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/sarama/sarama.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file18) | Do not exist | 80.5% | 
[pkg/channel/distributed/common/kafka/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file19) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/metrics/stats_reporter.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file20) | Do not exist | 75.0% | 
[pkg/channel/distributed/common/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file21) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file22) | Do not exist | 95.0% | 
[pkg/channel/distributed/controller/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file23) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/event/event.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file24) | Do not exist | 94.1% | 
[pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file25) | Do not exist | 76.9% | 
[pkg/channel/distributed/dispatcher/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file26) | Do not exist | 69.2% | 
[pkg/channel/distributed/dispatcher/controller/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file27) | Do not exist | 79.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file28) | Do not exist | 85.1% | 
[pkg/channel/distributed/dispatcher/dispatcher/handler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file29) | Do not exist | 90.9% | 
[pkg/channel/distributed/dispatcher/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file30) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file31) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/channel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file32) | Do not exist | 71.1% | 
[pkg/channel/distributed/receiver/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file33) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file34) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file35) | Do not exist | 76.8% | 
[pkg/channel/distributed/receiver/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306256297225621510/artifacts/line-cov.html#file36) | Do not exist | 100.0% | 

knative-prow-robot: @travis-minke-sap: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-unit-tests | 72def3f3d3f2278539b1ef11a7aace9ec0c6a1b3 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-unit-tests/1306253276936671241) | `/test pull-knative-sandbox-eventing-kafka-unit-tests`
pull-knative-sandbox-eventing-kafka-build-tests | 432f112334078978c904ea1019c08d8a22055db0 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-build-tests/1306256297225621511) | `/test pull-knative-sandbox-eventing-kafka-build-tests`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/53). [Your PR dashboard](https://gubernator.knative.dev/pr/travis-minke-sap).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-prow-robot: @travis-minke-sap: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-build-tests | 432f112334078978c904ea1019c08d8a22055db0 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-build-tests/1306256297225621511) | `/test pull-knative-sandbox-eventing-kafka-build-tests`
pull-knative-sandbox-eventing-kafka-unit-tests | 432f112334078978c904ea1019c08d8a22055db0 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-unit-tests/1306256297225621512) | `/test pull-knative-sandbox-eventing-kafka-unit-tests`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/53). [Your PR dashboard](https://gubernator.knative.dev/pr/travis-minke-sap).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-metrics-robot: The following is the coverage report on the affected files.
Say `/test pull-knative-sandbox-eventing-kafka-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/channel/distributed/common/config/configwatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file0) | Do not exist | 54.5% | 
[pkg/channel/distributed/common/config/observability.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file1) | Do not exist | 64.0% | 
[pkg/channel/distributed/common/config/tracing.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file2) | Do not exist | 84.6% | 
[pkg/channel/distributed/common/env/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file3) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file4) | Do not exist | 92.5% | 
[pkg/channel/distributed/common/k8s/context.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file5) | Do not exist | 60.0% | 
[pkg/channel/distributed/common/k8s/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file6) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/admin.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file7) | Do not exist | 55.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_custom.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file8) | Do not exist | 72.2% | 
[pkg/channel/distributed/common/kafka/admin/admin_eventhub.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file9) | Do not exist | 88.6% | 
[pkg/channel/distributed/common/kafka/admin/admin_kafka.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file10) | Do not exist | 83.3% | 
[pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file11) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file12) | Do not exist | 77.1% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file13) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file14) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/admin/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file15) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/kafka/consumer/consumer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file16) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file17) | Do not exist | 66.7% | 
[pkg/channel/distributed/common/kafka/sarama/sarama.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file18) | Do not exist | 80.5% | 
[pkg/channel/distributed/common/kafka/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file19) | Do not exist | 100.0% | 
[pkg/channel/distributed/common/metrics/stats_reporter.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file20) | Do not exist | 75.0% | 
[pkg/channel/distributed/common/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file21) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file22) | Do not exist | 95.0% | 
[pkg/channel/distributed/controller/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file23) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/event/event.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file24) | Do not exist | 94.1% | 
[pkg/channel/distributed/controller/kafkachannel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file25) | Do not exist | 91.4% | 
[pkg/channel/distributed/controller/kafkachannel/controller.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file26) | Do not exist | 73.3% | 
[pkg/channel/distributed/controller/kafkachannel/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file27) | Do not exist | 86.1% | 
[pkg/channel/distributed/controller/kafkachannel/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file28) | Do not exist | 81.4% | 
[pkg/channel/distributed/controller/kafkachannel/reconciler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file29) | Do not exist | 79.7% | 
[pkg/channel/distributed/controller/kafkachannel/topic.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file30) | Do not exist | 79.5% | 
[pkg/channel/distributed/controller/kafkasecret/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file31) | Do not exist | 86.7% | 
[pkg/channel/distributed/controller/kafkasecret/controller.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file32) | Do not exist | 67.9% | 
[pkg/channel/distributed/controller/kafkasecret/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file33) | Do not exist | 71.1% | 
[pkg/channel/distributed/controller/kafkasecret/reconciler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file34) | Do not exist | 90.5% | 
[pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file35) | Do not exist | 76.9% | 
[pkg/channel/distributed/controller/util/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file36) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file37) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/dns.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file38) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/finalizer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file39) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/hash.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file40) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/secret.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file41) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/subscription.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file42) | Do not exist | 100.0% | 
[pkg/channel/distributed/controller/util/topic.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file43) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/config/config.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file44) | Do not exist | 69.2% | 
[pkg/channel/distributed/dispatcher/controller/kafkachannel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file45) | Do not exist | 79.2% | 
[pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file46) | Do not exist | 85.1% | 
[pkg/channel/distributed/dispatcher/dispatcher/handler.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file47) | Do not exist | 90.9% | 
[pkg/channel/distributed/dispatcher/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file48) | Do not exist | 100.0% | 
[pkg/channel/distributed/dispatcher/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file49) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/channel/channel.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file50) | Do not exist | 71.1% | 
[pkg/channel/distributed/receiver/env/environment.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file51) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/health/health.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file52) | Do not exist | 100.0% | 
[pkg/channel/distributed/receiver/producer/producer.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file53) | Do not exist | 76.8% | 
[pkg/channel/distributed/receiver/util/util.go](https://storage.cloud.google.com/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/53/pull-knative-sandbox-eventing-kafka-go-coverage/1306259442634854400/artifacts/line-cov.html#file54) | Do not exist | 100.0% | 

lgtm-com[bot]: This pull request **introduces 11 alerts** and **fixes 11** when merging 20f33971cc5b1a4614840e81d9892fa251606a01 into f90c2348ccba875df014eda35231c0dba65d147a - [view on LGTM.com](https://lgtm.com/projects/g/knative-sandbox/eventing-kafka/rev/pr-3737661f51a5972038ffd67921c0255f981b1200)

**new alerts:**

* 11 for Useless assignment to local variable

**fixed alerts:**

* 11 for Useless assignment to local variable
travis-minke-sap: Hey everyone - I've finished creating the necessary unit tests and merging in master/ changes, etc...  Last chance to review - tomorrow morning (Thursday US Mountain time) I'll remove the "/ hold" flag and let this move forward.   Thanks again to everyone for their input!
travis-minke-sap: /hold cancel
knative-prow-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka/pull/53#pullrequestreview-490841893" title="Approved">matzew</a>*, *<a href="https://github.com/knative-sandbox/eventing-kafka/pull/53#" title="Author self-approved">travis-minke-sap</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=knative-sandbox%2Feventing-kafka).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/knative-sandbox/eventing-kafka/blob/master/OWNERS)~~ [matzew,travis-minke-sap]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->

Patch:
diff --git a/.gitignore b/.gitignore
index e425d9170..38cca5ec8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,11 +7,5 @@
 .DS_Store
 Thumbs.db
 
-# Build Artifacts
-build/*/coverage.out
-build/channel/eventing-kafka-channel
-build/controller/kafka-channel-controller
-build/dispatcher/eventing-kafka-dispatcher
-
 # Telepresence Logs
 telepresence.log
diff --git a/cmd/channel/consolidated/README.md b/cmd/channel/consolidated/README.md
new file mode 100644
index 000000000..04b67bf01
--- /dev/null
+++ b/cmd/channel/consolidated/README.md
@@ -0,0 +1,1 @@
+TODO - eventing-contrib/kafka cmd/ content here
diff --git a/cmd/controller/main.go b/cmd/channel/distributed/controller/main.go
similarity index 73%
rename from cmd/controller/main.go
rename to cmd/channel/distributed/controller/main.go
index aa674f059..4623a4ddd 100644
--- a/cmd/controller/main.go
+++ b/cmd/channel/distributed/controller/main.go
@@ -4,9 +4,9 @@ import (
 	// Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters).
 	// _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/kafkachannel"
-	"knative.dev/eventing-kafka/pkg/controller/kafkasecret"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkachannel"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkasecret"
 	"knative.dev/pkg/injection/sharedmain"
 )
 
diff --git a/cmd/dispatcher/main.go b/cmd/channel/distributed/dispatcher/main.go
similarity index 90%
rename from cmd/dispatcher/main.go
rename to cmd/channel/distributed/dispatcher/main.go
index aed048456..66450085e 100644
--- a/cmd/dispatcher/main.go
+++ b/cmd/channel/distributed/dispatcher/main.go
@@ -12,15 +12,15 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned"
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/informers/externalversions"
-	commonconfig "knative.dev/eventing-kafka/pkg/common/config"
-	commonk8s "knative.dev/eventing-kafka/pkg/common/k8s"
-	"knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	"knative.dev/eventing-kafka/pkg/common/metrics"
-	dispatcherconfig "knative.dev/eventing-kafka/pkg/dispatcher/config"
-	"knative.dev/eventing-kafka/pkg/dispatcher/controller"
-	dispatch "knative.dev/eventing-kafka/pkg/dispatcher/dispatcher"
-	"knative.dev/eventing-kafka/pkg/dispatcher/env"
-	dispatcherhealth "knative.dev/eventing-kafka/pkg/dispatcher/health"
+	commonconfig "knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	commonk8s "knative.dev/eventing-kafka/pkg/channel/distributed/common/k8s"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/metrics"
+	dispatcherconfig "knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/controller"
+	dispatch "knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/dispatcher"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/env"
+	dispatcherhealth "knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/health"
 	kncontroller "knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
 	eventingmetrics "knative.dev/pkg/metrics"
diff --git a/cmd/channel/main.go b/cmd/channel/distributed/receiver/main.go
similarity index 89%
rename from cmd/channel/main.go
rename to cmd/channel/distributed/receiver/main.go
index a1cd6a623..ca94b5231 100644
--- a/cmd/channel/main.go
+++ b/cmd/channel/distributed/receiver/main.go
@@ -10,16 +10,16 @@ import (
 	"github.com/cloudevents/sdk-go/v2/binding"
 	"go.uber.org/zap"
 	v1 "k8s.io/api/core/v1"
-	"knative.dev/eventing-kafka/pkg/channel/channel"
-	"knative.dev/eventing-kafka/pkg/channel/constants"
-	"knative.dev/eventing-kafka/pkg/channel/env"
-	channelhealth "knative.dev/eventing-kafka/pkg/channel/health"
-	"knative.dev/eventing-kafka/pkg/channel/producer"
-	commonconfig "knative.dev/eventing-kafka/pkg/common/config"
-	commonk8s "knative.dev/eventing-kafka/pkg/common/k8s"
-	"knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	kafkautil "knative.dev/eventing-kafka/pkg/common/kafka/util"
-	"knative.dev/eventing-kafka/pkg/common/metrics"
+	commonconfig "knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	commonk8s "knative.dev/eventing-kafka/pkg/channel/distributed/common/k8s"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	kafkautil "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/metrics"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/channel"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/env"
+	channelhealth "knative.dev/eventing-kafka/pkg/channel/distributed/receiver/health"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/producer"
 	eventingchannel "knative.dev/eventing/pkg/channel"
 	"knative.dev/pkg/logging"
 	eventingmetrics "knative.dev/pkg/metrics"
diff --git a/cmd/source/README.md b/cmd/source/README.md
new file mode 100644
index 000000000..80056fbe6
--- /dev/null
+++ b/cmd/source/README.md
@@ -0,0 +1,1 @@
+# TODO - eventing-contrib/kafka/source/cmd content here
diff --git a/cmd/webhook/README.md b/cmd/webhook/README.md
new file mode 100644
index 000000000..56dd8e6d2
--- /dev/null
+++ b/cmd/webhook/README.md
@@ -0,0 +1,1 @@
+# TODO - eventing-contrib/kafka/cmd/webhook content here
diff --git a/config/channel/consolidated/README.md b/config/channel/consolidated/README.md
new file mode 100644
index 000000000..800755345
--- /dev/null
+++ b/config/channel/consolidated/README.md
@@ -0,0 +1,1 @@
+# TODO - eventing-contrib/kafka config content here
diff --git a/config/100-addressable-resolver-clusterrole.yaml b/config/channel/distributed/100-addressable-resolver-clusterrole.yaml
similarity index 100%
rename from config/100-addressable-resolver-clusterrole.yaml
rename to config/channel/distributed/100-addressable-resolver-clusterrole.yaml
diff --git a/config/100-channelable-manipulator-clusterrole.yaml b/config/channel/distributed/100-channelable-manipulator-clusterrole.yaml
similarity index 100%
rename from config/100-channelable-manipulator-clusterrole.yaml
rename to config/channel/distributed/100-channelable-manipulator-clusterrole.yaml
diff --git a/config/100-controller-clusterrole.yaml b/config/channel/distributed/100-controller-clusterrole.yaml
similarity index 100%
rename from config/100-controller-clusterrole.yaml
rename to config/channel/distributed/100-controller-clusterrole.yaml
diff --git a/config/100-controller-clusterrolebinding.yaml b/config/channel/distributed/100-controller-clusterrolebinding.yaml
similarity index 100%
rename from config/100-controller-clusterrolebinding.yaml
rename to config/channel/distributed/100-controller-clusterrolebinding.yaml
diff --git a/config/100-controller-role.yaml b/config/channel/distributed/100-controller-role.yaml
similarity index 100%
rename from config/100-controller-role.yaml
rename to config/channel/distributed/100-controller-role.yaml
diff --git a/config/100-controller-rolebinding.yaml b/config/channel/distributed/100-controller-rolebinding.yaml
similarity index 100%
rename from config/100-controller-rolebinding.yaml
rename to config/channel/distributed/100-controller-rolebinding.yaml
diff --git a/config/100-controller-serviceaccount.yaml b/config/channel/distributed/100-controller-serviceaccount.yaml
similarity index 73%
rename from config/100-controller-serviceaccount.yaml
rename to config/channel/distributed/100-controller-serviceaccount.yaml
index 25f23653d..b985447b8 100644
--- a/config/100-controller-serviceaccount.yaml
+++ b/config/channel/distributed/100-controller-serviceaccount.yaml
@@ -4,4 +4,4 @@ metadata:
   name: eventing-kafka-channel-controller
   namespace: knative-eventing
   labels:
-    kafka.eventing.knative.dev/release: devel
\ No newline at end of file
+    kafka.eventing.knative.dev/release: devel
diff --git a/config/200-eventing-kafka-configmap.yaml b/config/channel/distributed/200-eventing-kafka-configmap.yaml
similarity index 97%
rename from config/200-eventing-kafka-configmap.yaml
rename to config/channel/distributed/200-eventing-kafka-configmap.yaml
index ecbbdcfab..ce46bc047 100644
--- a/config/200-eventing-kafka-configmap.yaml
+++ b/config/channel/distributed/200-eventing-kafka-configmap.yaml
@@ -13,7 +13,6 @@ data:
         Enable: true
         Mechanism: PLAIN
         Version: 1
-      KeepAlive: 30000000000  # 30 seconds
     Metadata:
       RefreshFrequency: 300000000000  # 5 minutes
     Consumer:
diff --git a/config/200-kafkachannel-crd.yaml b/config/channel/distributed/200-kafkachannel-crd.yaml
similarity index 100%
rename from config/200-kafkachannel-crd.yaml
rename to config/channel/distributed/200-kafkachannel-crd.yaml
diff --git a/config/200-leader-election-config.yaml b/config/channel/distributed/200-leader-election-config.yaml
similarity index 100%
rename from config/200-leader-election-config.yaml
rename to config/channel/distributed/200-leader-election-config.yaml
diff --git a/config/300-kafka-secret.yaml b/config/channel/distributed/300-kafka-secret.yaml
similarity index 95%
rename from config/300-kafka-secret.yaml
rename to config/channel/distributed/300-kafka-secret.yaml
index 55297a2ff..1f7418972 100644
--- a/config/300-kafka-secret.yaml
+++ b/config/channel/distributed/300-kafka-secret.yaml
@@ -11,4 +11,4 @@ metadata:
   namespace: knative-eventing
   labels:
     eventing-kafka.knative.dev/kafka-secret: "true"
-type: Opaque
\ No newline at end of file
+type: Opaque
diff --git a/config/300-service.yaml b/config/channel/distributed/300-service.yaml
similarity index 100%
rename from config/300-service.yaml
rename to config/channel/distributed/300-service.yaml
diff --git a/config/400-deployment.yaml b/config/channel/distributed/400-deployment.yaml
similarity index 85%
rename from config/400-deployment.yaml
rename to config/channel/distributed/400-deployment.yaml
index 42414f2bb..0e77e2f37 100644
--- a/config/400-deployment.yaml
+++ b/config/channel/distributed/400-deployment.yaml
@@ -21,7 +21,7 @@ spec:
       serviceAccountName: eventing-kafka-channel-controller
       containers:
       - name: eventing-kafka
-        image: ko://knative.dev/eventing-kafka/cmd/controller
+        image: ko://knative.dev/eventing-kafka/cmd/channel/distributed/controller
         imagePullPolicy: IfNotPresent # Must be IfNotPresent or Never if used with ko.local
         ports:
         - containerPort: 8081
@@ -44,9 +44,9 @@ spec:
         - name: METRICS_DOMAIN
           value: "eventing-kafka"
         - name: CHANNEL_IMAGE
-          value: "ko://knative.dev/eventing-kafka/cmd/channel"
+          value: "ko://knative.dev/eventing-kafka/cmd/channel/distributed/receiver"
         - name: DISPATCHER_IMAGE
-          value: "ko://knative.dev/eventing-kafka/cmd/dispatcher"
+          value: "ko://knative.dev/eventing-kafka/cmd/channel/distributed/dispatcher"
         resources:
           requests:
             cpu: 20m
diff --git a/config/README.md b/config/channel/distributed/README.md
similarity index 93%
rename from config/README.md
rename to config/channel/distributed/README.md
index d224d45db..1a8d8a72f 100644
--- a/config/README.md
+++ b/config/channel/distributed/README.md
@@ -1,9 +1,9 @@
-# Eventing-Kafka Config
+# Distributed KafkaChannel Config
 
 The YAML files in this directory represent the [ko](https://github.com/google/ko) development
-level configuration use to work on the eventing-kafka source.  They will install eventing-kafka
+level configuration use to work on the distributed kafka channel source.  They will install
 into the existing Kubernetes cluster which should have Knative Eventing installed.   It is also
-expected that the user will provide a viable Kafka cluster.
+expected that the user will provide a viable Kafka cluster and associated configuration.
 
 ## Usage
 
@@ -16,9 +16,9 @@ populated for the user provided Kafka cluster.  Similarly the **data** values of
 [eventing-kafka-configmap.yaml](200-eventing-kafka-configmap.yaml) file should be configured
 for your particular use case.
 
-Install via `ko apply --strict -f ./config` from the parent/root directory in order to build
-and deploy the project.  The `--strict` option is really only needed when using the `custom`
-AdminType, but shouldn't hurt in other cases.
+Install via `ko apply --strict -f ./config/channel/distributed` from the repository root
+directory in order to build and deploy the project.  The `--strict` option is really only
+needed when using the `custom` AdminType, but shouldn't hurt in other cases.
 
 ## Kafka Admin Types
 
@@ -29,7 +29,7 @@ field in [eventing-kafka-configmap.yaml](200-eventing-kafka-configmap.yaml) and
 
 - **kafka:** This is the normal / default use case that most users will want.  It uses the standard Kafka API (via the Sarama ClusterAdmin) for managing Kafka Topics in the cluster.
 - **azure:** Users of Azure EventHubs will know that Microsoft does not support the standard Kafka Topic administration and are required instead to use their API.  This option provides for such support via the Microsoft Azure EventHub Go client.
-- **custom:** This option provides an external hook for users who need to manage Topics themselves. This could be to support a proprietary Kafka implementation with a custom interface / API.  The user is responsible for implementing a sidecar Container with the expected HTTP endpoints.  They will need to add their sidecar Container to the [deployment.yaml](400-deployment.yaml).  Details for implementing such a solution can be found in the [Kafka README](../pkg/common/kafka/README.md).
+- **custom:** This option provides an external hook for users who need to manage Topics themselves. This could be to support a proprietary Kafka implementation with a custom interface / API.  The user is responsible for implementing a sidecar Container with the expected HTTP endpoints.  They will need to add their sidecar Container to the [deployment.yaml](400-deployment.yaml).  Details for implementing such a solution can be found in the [Kafka README](../../../pkg/channel/distributed/common/kafka/README.md).
 
 > Note: This setting only alters the mechanism by which Kafka Topics are managed (Create & Delete).
 > In all cases the same Sarama SyncProducer and ConsumerGroup implementation is used to
diff --git a/config/channel/webhook/README.md b/config/channel/webhook/README.md
new file mode 100644
index 000000000..bae9ffbde
--- /dev/null
+++ b/config/channel/webhook/README.md
@@ -0,0 +1,1 @@
+# TODO - eventing-contrib/kafka webhook config content here
diff --git a/config/source/README.md b/config/source/README.md
new file mode 100644
index 000000000..e8f5c8dc7
--- /dev/null
+++ b/config/source/README.md
@@ -0,0 +1,1 @@
+# TODO - eventing-contrib/kafka source config content here
diff --git a/pkg/apis/README.md b/pkg/apis/README.md
new file mode 100644
index 000000000..aa4068fea
--- /dev/null
+++ b/pkg/apis/README.md
@@ -0,0 +1,1 @@
+# TODO - eventing-contrib/kafka/channel/pkg/apis content here
diff --git a/pkg/channel/consolidated/README.md b/pkg/channel/consolidated/README.md
new file mode 100644
index 000000000..9262d82c7
--- /dev/null
+++ b/pkg/channel/consolidated/README.md
@@ -0,0 +1,1 @@
+TODO - eventing-contrib/kafka channel here !
diff --git a/pkg/channel/distributed/.gitignore b/pkg/channel/distributed/.gitignore
new file mode 100644
index 000000000..2b8398b4a
--- /dev/null
+++ b/pkg/channel/distributed/.gitignore
@@ -0,0 +1,12 @@
+# System Files
+.DS_Store
+Thumbs.db
+
+# Build Artifacts
+build/*/coverage.out
+build/receiver/eventing-kafka-channel
+build/controller/kafka-channel-controller
+build/dispatcher/eventing-kafka-dispatcher
+
+# Telepresence Logs
+telepresence.log
diff --git a/Makefile b/pkg/channel/distributed/Makefile
similarity index 52%
rename from Makefile
rename to pkg/channel/distributed/Makefile
index 90ee39515..fcd9a12bd 100644
--- a/Makefile
+++ b/pkg/channel/distributed/Makefile
@@ -1,17 +1,18 @@
 ################################################################################
 ##
-##                     Eventing-Kafka Makefile
+##            Eventing-Kafka Distributed Channel Makefile
 ##
 ################################################################################
 
 # Project Directories
 BUILD_ROOT:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 BUILD_DIR:=$(BUILD_ROOT)/build
-CHANNEL_BUILD_DIR=$(BUILD_DIR)/channel
 COMMON_BUILD_DIR=$(BUILD_DIR)/common
 CONTROLLER_BUILD_DIR=$(BUILD_DIR)/controller
 DISPATCHER_BUILD_DIR=$(BUILD_DIR)/dispatcher
+RECEIVER_BUILD_DIR=$(BUILD_DIR)/receiver
 
+# TODO - Move to a top level hack script or something?  maybe also a mid level hack script(s) for our tests
 
 #
 # Mod / Fmt / Vet / Lint
@@ -27,13 +28,13 @@ format:
 
 vet:
 	@echo 'Vetting Packages'
-	go vet -v ./cmd/...
-	go vet -v ./pkg/...
+	go vet -v ../../../cmd/channel/distributed/...
+	go vet -v ./...
 
 lint:
 	@echo 'Linting Packages'
-	golint ./cmd/...
-	golint ./pkg/...
+	golint ../../../cmd/channel/distributed/...
+	golint ./...
 
 .PHONY: mod format vet lint
 
@@ -42,30 +43,30 @@ lint:
 # Testing
 #
 
-test-channel:
-	@echo 'Testing Channel'
-	mkdir -p $(CHANNEL_BUILD_DIR)
-	cd $(BUILD_ROOT); go test -race -v ./pkg/channel/... -coverprofile ${CHANNEL_BUILD_DIR}/coverage.out
-	cd $(BUILD_ROOT); go tool cover -func=${CHANNEL_BUILD_DIR}/coverage.out
-
 test-common:
 	@echo 'Testing Common'
 	mkdir -p $(COMMON_BUILD_DIR)
-	cd $(BUILD_ROOT); go test -race -v ./pkg/common/... -coverprofile ${COMMON_BUILD_DIR}/coverage.out
+	cd $(BUILD_ROOT); go test -race -v ./common/... -coverprofile ${COMMON_BUILD_DIR}/coverage.out
 	cd $(BUILD_ROOT); go tool cover -func=${COMMON_BUILD_DIR}/coverage.out
 
 test-controller:
 	@echo 'Testing Controller'
 	mkdir -p $(CONTROLLER_BUILD_DIR)
-	cd $(BUILD_ROOT); go test -race -v ./pkg/controller/... -coverprofile ${CONTROLLER_BUILD_DIR}/coverage.out
+	cd $(BUILD_ROOT); go test -race -v ./controller/... -coverprofile ${CONTROLLER_BUILD_DIR}/coverage.out
 	cd $(BUILD_ROOT); go tool cover -func=${CONTROLLER_BUILD_DIR}/coverage.out
 
 test-dispatcher:
 	@echo 'Testing Dispatcher'
 	mkdir -p $(DISPATCHER_BUILD_DIR)
-	cd $(BUILD_ROOT); go test -race -v ./pkg/dispatcher/... -coverprofile ${DISPATCHER_BUILD_DIR}/coverage.out
+	cd $(BUILD_ROOT); go test -race -v ./dispatcher/... -coverprofile ${DISPATCHER_BUILD_DIR}/coverage.out
 	cd $(BUILD_ROOT); go tool cover -func=${DISPATCHER_BUILD_DIR}/coverage.out
 
-test-all: test-channel test-common test-controller test-dispatcher
+test-receiver:
+	@echo 'Testing Receiver'
+	mkdir -p $(RECEIVER_BUILD_DIR)
+	cd $(BUILD_ROOT); go test -race -v ./receiver/... -coverprofile ${RECEIVER_BUILD_DIR}/coverage.out
+	cd $(BUILD_ROOT); go tool cover -func=${RECEIVER_BUILD_DIR}/coverage.out
+
+test-all: test-common test-controller test-dispatcher test-receiver
 
-.PHONY: test-channel test-common test-controller test-dispatcher test-all
+.PHONY: test-common test-controller test-dispatcher test-receiver test-all
diff --git a/README.md b/pkg/channel/distributed/README.md
similarity index 92%
rename from README.md
rename to pkg/channel/distributed/README.md
index 4cc4ba751..363b64860 100644
--- a/README.md
+++ b/pkg/channel/distributed/README.md
@@ -89,41 +89,41 @@ segregation / scaling.
 **Eventing-kafka** is comprised of three distinct runtime K8S deployments
 as follows...
 
-- [channel](./pkg/channel/README.md) - The event receiver of the Channel
+- [channel](receiver/README.md) - The event receiver of the Channel
   to which inbound messages are sent.  An http server which accepts messages that
   conform to the CloudEvent specification, and then writes those messages to the
   corresponding Kafka Topic. This is the "Producer" from the Kafka perspective.
   A separate Channel Deployment is created for each Kafka Secret detected in the
   knative-eventing namespace.
 
-- [controller](./pkg/controller/README.md) - This component implements
+- [controller](controller/README.md) - This component implements
   the `KafkaChannel` Controller. It is using the current knative-eventing
   "Shared Main" approach based directly on K8S informers / listers.  The
   controller is using the `KafkaChannel` CRD, api, and client from the current
   Knative eventing-contrib/kafka implementation in order to align as closely as
   possible with the existing implementation.
 
-- [dispatcher](./pkg/dispatcher/README.md) - This component runs the
+- [dispatcher](dispatcher/README.md) - This component runs the
   Kafka ConsumerGroups responsible for processing messages from the corresponding
   Kafka Topic.  This is the "Consumer" from the Kafka perspective.  A separate
   dispatcher Deployment will be created for each unique `KafkaChannel` (Kafka
   Topic), and will contain a distinct Kafka Consumer Group for each
   Subscription to the `KafkaChannel`.
 
-- [config](config/README.md) - Eventing-kafka **ko** installable YAML files for installation.
+- [config](../../../config/channel/distributed/README.md) - Eventing-kafka **ko** installable YAML files for installation.
 
 ### Control Plane
 
 The control plane for the Kafka Channels is managed by the
-[eventing-kafka-controller](./pkg/controller/README.md) which is installed
+[eventing-kafka-controller](controller/README.md) which is installed
 in the knative-eventing namespace. `KafkaChannel` Custom Resource instances can
 be created in any user namespace. The eventing-kafka-controller will guarantee
 that the Data Plane is configured to support the flow of events as defined by
 [Subscriptions](https://knative.dev/docs/reference/eventing/#messaging.knative.dev/v1alpha1.Subscription)
 to a KafkaChannel.  The underlying Kafka infrastructure to be used is defined in
-a specially labeled [K8S Secret](config/README.md#Credentials) in the
+a specially labeled [K8S Secret](../../../config/channel/distributed/README.md#Credentials) in the
 knative-eventing namespace.  Eventing-kafka supports several different Kafka
-(and Kafka-like) [infrastructures](config/README.md#Kafka%20Providers).
+(and Kafka-like) [infrastructures](../../../config/channel/distributed/README.md#Kafka%20Providers).
 
 ### Data Plane
 
@@ -155,4 +155,4 @@ and processing continues with the next event.
 ## Installation
 
 For installation and configuration instructions please see the config files
-[README](config/README.md).
+[README](../../../config/channel/distributed/README.md).
diff --git a/pkg/common/constants/constants.go b/pkg/channel/distributed/common/constants/constants.go
similarity index 100%
rename from pkg/common/constants/constants.go
rename to pkg/channel/distributed/common/constants/constants.go
diff --git a/pkg/common/env/constants.go b/pkg/channel/distributed/common/env/constants.go
similarity index 100%
rename from pkg/common/env/constants.go
rename to pkg/channel/distributed/common/env/constants.go
diff --git a/pkg/common/env/util.go b/pkg/channel/distributed/common/env/util.go
similarity index 100%
rename from pkg/common/env/util.go
rename to pkg/channel/distributed/common/env/util.go
diff --git a/pkg/common/env/util_test.go b/pkg/channel/distributed/common/env/util_test.go
similarity index 100%
rename from pkg/common/env/util_test.go
rename to pkg/channel/distributed/common/env/util_test.go
diff --git a/pkg/common/health/constants.go b/pkg/channel/distributed/common/health/constants.go
similarity index 100%
rename from pkg/common/health/constants.go
rename to pkg/channel/distributed/common/health/constants.go
diff --git a/pkg/common/health/health.go b/pkg/channel/distributed/common/health/health.go
similarity index 100%
rename from pkg/common/health/health.go
rename to pkg/channel/distributed/common/health/health.go
diff --git a/pkg/common/health/health_test.go b/pkg/channel/distributed/common/health/health_test.go
similarity index 100%
rename from pkg/common/health/health_test.go
rename to pkg/channel/distributed/common/health/health_test.go
diff --git a/pkg/common/k8s/context.go b/pkg/channel/distributed/common/k8s/context.go
similarity index 92%
rename from pkg/common/k8s/context.go
rename to pkg/channel/distributed/common/k8s/context.go
index aeb221a44..0d3574655 100644
--- a/pkg/common/k8s/context.go
+++ b/pkg/channel/distributed/common/k8s/context.go
@@ -16,10 +16,10 @@ import (
 )
 
 // K8sClientWrapper Used To Facilitate Unit Testing
-var K8sClientWrapper = func(masterUrl string, kubeconfigPath string) kubernetes.Interface {
+var K8sClientWrapper = func(serverUrl string, kubeconfigPath string) kubernetes.Interface {
 
 	// Create The K8S Configuration (In-Cluster By Default / Cmd Line Flags For Out-Of-Cluster Usage)
-	k8sConfig, err := k8sclientcmd.BuildConfigFromFlags(masterUrl, kubeconfigPath)
+	k8sConfig, err := k8sclientcmd.BuildConfigFromFlags(serverUrl, kubeconfigPath)
 	if err != nil {
 		log.Fatalf("Failed To Build Kubernetes Config: %v", err)
 	}
@@ -37,10 +37,10 @@ var K8sClientWrapper = func(masterUrl string, kubeconfigPath string) kubernetes.
 //        knative-eventing logging configuration and dynamic updating.  To that end, we are setting up a basic context ourselves
 //        that mirrors what the injection framework would have created.
 //
-func LoggingContext(ctx context.Context, component string, masterUrl string, kubeconfigPath string) context.Context {
+func LoggingContext(ctx context.Context, component string, serverUrl string, kubeconfigPath string) context.Context {
 
 	// Get The K8S Client
-	k8sClient := K8sClientWrapper(masterUrl, kubeconfigPath)
+	k8sClient := K8sClientWrapper(serverUrl, kubeconfigPath)
 
 	// Put The Kubernetes Client Into The Context Where The Injection Framework Expects It
 	ctx = context.WithValue(ctx, injectionclient.Key{}, k8sClient)
diff --git a/pkg/common/k8s/util.go b/pkg/channel/distributed/common/k8s/util.go
similarity index 100%
rename from pkg/common/k8s/util.go
rename to pkg/channel/distributed/common/k8s/util.go
diff --git a/pkg/common/k8s/util_test.go b/pkg/channel/distributed/common/k8s/util_test.go
similarity index 100%
rename from pkg/common/k8s/util_test.go
rename to pkg/channel/distributed/common/k8s/util_test.go
diff --git a/pkg/common/kafka/README.md b/pkg/channel/distributed/common/kafka/README.md
similarity index 93%
rename from pkg/common/kafka/README.md
rename to pkg/channel/distributed/common/kafka/README.md
index 879ce34d6..6568045be 100644
--- a/pkg/common/kafka/README.md
+++ b/pkg/channel/distributed/common/kafka/README.md
@@ -23,7 +23,7 @@ data:
 ```
 
 > Note - The username and password fields from the Kubernetes Secret will override any similar values
-> provided in the `sarama` section of the [ConfigMap](../../../config/200-eventing-kafka-configmap.yaml).
+> provided in the `sarama` section of the [ConfigMap](../../../../../config/channel/distributed/200-eventing-kafka-configmap.yaml).
 
 ## Producer / Consumer
 
@@ -58,15 +58,15 @@ implementation requirements in order for this proxying of requests to work succe
     The following changes to the default config/ YAML will be required in order to deploy a custom sidecar
     as part of the eventing-kafka Controller Deployment...
 
-    - **ConfigMap:** The `data.eventing-kafka.kafka.adminType` field in the [ConfigMap](../../../config/200-eventing-kafka-configmap.yaml)
+    - **ConfigMap:** The `data.eventing-kafka.kafka.adminType` field in the [ConfigMap](../../../../../config/channel/distributed/200-eventing-kafka-configmap.yaml)
       must be set to `custom`.  This tells eventing-kafka that it should proxy Topic creation and deletion requests
       to the expected sidecar endpoints as defined below.
 
-    - **Deployment:** The sidecar Container will need to be added to the [Controller Deployment](../../../config/400-deployment.yaml)
+    - **Deployment:** The sidecar Container will need to be added to the [Controller Deployment](../../../../../config/channel/distributed/400-deployment.yaml)
       along with any other supporting infrastructure (VolumeMounts, etc.).
 
-    - **Service Account:** The default [ServiceAccount](../../../config/100-controller-serviceaccount.yaml) is used by
-      the [Controller Deployment](../../../config/400-deployment.yaml) to pull images.  This ServiceAccount
+    - **Service Account:** The default [ServiceAccount](../../../../../config/channel/distributed/100-controller-serviceaccount.yaml) is used by
+      the [Controller Deployment](../../../../../config/channel/distributed/400-deployment.yaml) to pull images.  This ServiceAccount
       will need to be updated to include any `imagePullSecrets` required to pull the custom sidecar Container image.
 
     - **Miscellaneous:** It is the responsibility of the sidecar implementer to include any additional Kubernetes resources that
diff --git a/pkg/common/kafka/admin/admin.go b/pkg/channel/distributed/common/kafka/admin/admin.go
similarity index 97%
rename from pkg/common/kafka/admin/admin.go
rename to pkg/channel/distributed/common/kafka/admin/admin.go
index dc0849ecc..71e53dba3 100644
--- a/pkg/common/kafka/admin/admin.go
+++ b/pkg/channel/distributed/common/kafka/admin/admin.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/Shopify/sarama"
-	"knative.dev/eventing-kafka/pkg/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
 )
 
 // Sarama ClusterAdmin Wrapping Interface To Facilitate Other Implementations (e.g. Azure EventHubs)
diff --git a/pkg/common/kafka/admin/admin_custom.go b/pkg/channel/distributed/common/kafka/admin/admin_custom.go
similarity index 98%
rename from pkg/common/kafka/admin/admin_custom.go
rename to pkg/channel/distributed/common/kafka/admin/admin_custom.go
index 7e57686f7..736c7877d 100644
--- a/pkg/common/kafka/admin/admin_custom.go
+++ b/pkg/channel/distributed/common/kafka/admin/admin_custom.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Shopify/sarama"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
-	"knative.dev/eventing-kafka/pkg/common/kafka/admin/custom"
-	adminutil "knative.dev/eventing-kafka/pkg/common/kafka/admin/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin/custom"
+	adminutil "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin/util"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/logging"
 )
diff --git a/pkg/common/kafka/admin/admin_eventhub.go b/pkg/channel/distributed/common/kafka/admin/admin_eventhub.go
similarity index 97%
rename from pkg/common/kafka/admin/admin_eventhub.go
rename to pkg/channel/distributed/common/kafka/admin/admin_eventhub.go
index 6dd297647..4fbbb29ff 100644
--- a/pkg/common/kafka/admin/admin_eventhub.go
+++ b/pkg/channel/distributed/common/kafka/admin/admin_eventhub.go
@@ -6,9 +6,9 @@ import (
 	eventhub "github.com/Azure/azure-event-hubs-go"
 	"github.com/Shopify/sarama"
 	"go.uber.org/zap"
-	"knative.dev/eventing-kafka/pkg/common/kafka/admin/eventhubcache"
-	adminutil "knative.dev/eventing-kafka/pkg/common/kafka/admin/util"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin/eventhubcache"
+	adminutil "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 	"knative.dev/pkg/logging"
 	"math"
 	"regexp"
diff --git a/pkg/common/kafka/admin/admin_kafka.go b/pkg/channel/distributed/common/kafka/admin/admin_kafka.go
similarity index 95%
rename from pkg/common/kafka/admin/admin_kafka.go
rename to pkg/channel/distributed/common/kafka/admin/admin_kafka.go
index df524c71f..a1e726e82 100644
--- a/pkg/common/kafka/admin/admin_kafka.go
+++ b/pkg/channel/distributed/common/kafka/admin/admin_kafka.go
@@ -9,9 +9,9 @@ import (
 	"github.com/Shopify/sarama"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
-	adminutil "knative.dev/eventing-kafka/pkg/common/kafka/admin/util"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
-	kafkasarama "knative.dev/eventing-kafka/pkg/common/kafka/sarama"
+	adminutil "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
+	kafkasarama "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/logging"
 )
diff --git a/pkg/common/kafka/admin/custom/constants.go b/pkg/channel/distributed/common/kafka/admin/custom/constants.go
similarity index 100%
rename from pkg/common/kafka/admin/custom/constants.go
rename to pkg/channel/distributed/common/kafka/admin/custom/constants.go
diff --git a/pkg/common/kafka/admin/custom/topic_detail.go b/pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go
similarity index 100%
rename from pkg/common/kafka/admin/custom/topic_detail.go
rename to pkg/channel/distributed/common/kafka/admin/custom/topic_detail.go
diff --git a/pkg/common/kafka/admin/custom/topic_detail_test.go b/pkg/channel/distributed/common/kafka/admin/custom/topic_detail_test.go
similarity index 100%
rename from pkg/common/kafka/admin/custom/topic_detail_test.go
rename to pkg/channel/distributed/common/kafka/admin/custom/topic_detail_test.go
diff --git a/pkg/common/kafka/admin/eventhubcache/cache.go b/pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go
similarity index 97%
rename from pkg/common/kafka/admin/eventhubcache/cache.go
rename to pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go
index a15845158..66d9cd0c5 100644
--- a/pkg/common/kafka/admin/eventhubcache/cache.go
+++ b/pkg/channel/distributed/common/kafka/admin/eventhubcache/cache.go
@@ -7,8 +7,8 @@ import (
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
-	"knative.dev/eventing-kafka/pkg/common/kafka/admin/util"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/logging"
 )
diff --git a/pkg/common/kafka/admin/eventhubcache/namespace.go b/pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go
similarity index 95%
rename from pkg/common/kafka/admin/eventhubcache/namespace.go
rename to pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go
index 59b5e3f14..8900061db 100644
--- a/pkg/common/kafka/admin/eventhubcache/namespace.go
+++ b/pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace.go
@@ -3,7 +3,7 @@ package eventhubcache
 import (
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 )
 
 // Azure EventHubs Namespace Struct
diff --git a/pkg/common/kafka/admin/util/util.go b/pkg/channel/distributed/common/kafka/admin/util/util.go
similarity index 96%
rename from pkg/common/kafka/admin/util/util.go
rename to pkg/channel/distributed/common/kafka/admin/util/util.go
index 8b1711b4f..da886cded 100644
--- a/pkg/common/kafka/admin/util/util.go
+++ b/pkg/channel/distributed/common/kafka/admin/util/util.go
@@ -6,7 +6,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 )
 
 // Utility Function For Getting All (Limit 100) The Kafka Secrets In A K8S Namespace
diff --git a/pkg/common/kafka/sarama/sarama.go b/pkg/channel/distributed/common/kafka/sarama/sarama.go
similarity index 98%
rename from pkg/common/kafka/sarama/sarama.go
rename to pkg/channel/distributed/common/kafka/sarama/sarama.go
index 5ca995a9d..6e75b31a4 100644
--- a/pkg/common/kafka/sarama/sarama.go
+++ b/pkg/channel/distributed/common/kafka/sarama/sarama.go
@@ -17,9 +17,9 @@ import (
 	"github.com/rcrowley/go-metrics"
 	"golang.org/x/net/proxy"
 	corev1 "k8s.io/api/core/v1"
-	commonconfig "knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
-	"knative.dev/eventing-kafka/pkg/common/testing"
+	commonconfig "knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 )
 
diff --git a/pkg/common/kafka/testing/mocks.go b/pkg/channel/distributed/common/kafka/testing/mocks.go
similarity index 100%
rename from pkg/common/kafka/testing/mocks.go
rename to pkg/channel/distributed/common/kafka/testing/mocks.go
diff --git a/pkg/common/kafka/util/util.go b/pkg/channel/distributed/common/kafka/util/util.go
similarity index 89%
rename from pkg/common/kafka/util/util.go
rename to pkg/channel/distributed/common/kafka/util/util.go
index c519459ce..996c53e9b 100644
--- a/pkg/common/kafka/util/util.go
+++ b/pkg/channel/distributed/common/kafka/util/util.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 )
 
 // Get The Formatted Kafka Topic Name From The Specified Components
diff --git a/pkg/common/testing/constants.go b/pkg/channel/distributed/common/testing/constants.go
similarity index 100%
rename from pkg/common/testing/constants.go
rename to pkg/channel/distributed/common/testing/constants.go
diff --git a/pkg/common/testing/util.go b/pkg/channel/distributed/common/testing/util.go
similarity index 100%
rename from pkg/common/testing/util.go
rename to pkg/channel/distributed/common/testing/util.go
diff --git a/pkg/common/util/util.go b/pkg/channel/distributed/common/util/util.go
similarity index 100%
rename from pkg/common/util/util.go
rename to pkg/channel/distributed/common/util/util.go
diff --git a/pkg/common/util/util_test.go b/pkg/channel/distributed/common/util/util_test.go
similarity index 100%
rename from pkg/common/util/util_test.go
rename to pkg/channel/distributed/common/util/util_test.go
diff --git a/pkg/controller/README.md b/pkg/channel/distributed/controller/README.md
similarity index 100%
rename from pkg/controller/README.md
rename to pkg/channel/distributed/controller/README.md
diff --git a/pkg/controller/config/config.go b/pkg/channel/distributed/controller/config/config.go
similarity index 95%
rename from pkg/controller/config/config.go
rename to pkg/channel/distributed/controller/config/config.go
index 5823165c6..a663edf41 100644
--- a/pkg/controller/config/config.go
+++ b/pkg/channel/distributed/controller/config/config.go
@@ -4,8 +4,8 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/api/resource"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 )
 
 // ConfigurationError is the type of error returned from VerifyOverrides
diff --git a/pkg/controller/constants/constants.go b/pkg/channel/distributed/controller/constants/constants.go
similarity index 100%
rename from pkg/controller/constants/constants.go
rename to pkg/channel/distributed/controller/constants/constants.go
diff --git a/pkg/controller/env/environment.go b/pkg/channel/distributed/controller/env/environment.go
similarity index 96%
rename from pkg/controller/env/environment.go
rename to pkg/channel/distributed/controller/env/environment.go
index 43f5cceb7..02a65697b 100644
--- a/pkg/controller/env/environment.go
+++ b/pkg/channel/distributed/controller/env/environment.go
@@ -2,7 +2,7 @@ package env
 
 import (
 	"go.uber.org/zap"
-	"knative.dev/eventing-kafka/pkg/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
 )
 
 // Package Constants
diff --git a/pkg/controller/event/event.go b/pkg/channel/distributed/controller/event/event.go
similarity index 100%
rename from pkg/controller/event/event.go
rename to pkg/channel/distributed/controller/event/event.go
diff --git a/pkg/controller/event/event_test.go b/pkg/channel/distributed/controller/event/event_test.go
similarity index 100%
rename from pkg/controller/event/event_test.go
rename to pkg/channel/distributed/controller/event/event_test.go
diff --git a/pkg/controller/kafkachannel/channel.go b/pkg/channel/distributed/controller/kafkachannel/channel.go
similarity index 93%
rename from pkg/controller/kafkachannel/channel.go
rename to pkg/channel/distributed/controller/kafkachannel/channel.go
index 2fc12aa2e..66a422f8a 100644
--- a/pkg/controller/kafkachannel/channel.go
+++ b/pkg/channel/distributed/controller/kafkachannel/channel.go
@@ -9,11 +9,11 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/constants"
-	kafkautil "knative.dev/eventing-kafka/pkg/common/kafka/util"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/util"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	kafkautil "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	eventingNames "knative.dev/eventing/pkg/reconciler/names"
 	eventingUtils "knative.dev/eventing/pkg/utils"
 	"knative.dev/pkg/apis"
diff --git a/pkg/controller/kafkachannel/controller.go b/pkg/channel/distributed/controller/kafkachannel/controller.go
similarity index 91%
rename from pkg/controller/kafkachannel/controller.go
rename to pkg/channel/distributed/controller/kafkachannel/controller.go
index 9e0535e61..04c69bf06 100644
--- a/pkg/controller/kafkachannel/controller.go
+++ b/pkg/channel/distributed/controller/kafkachannel/controller.go
@@ -10,12 +10,12 @@ import (
 	kafkaclientsetinjection "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client"
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel"
 	kafkachannelreconciler "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/reconciler/messaging/v1beta1/kafkachannel"
-	commonconfig "knative.dev/eventing-kafka/pkg/common/config"
-	kafkaadmin "knative.dev/eventing-kafka/pkg/common/kafka/admin"
-	"knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/env"
-	"knative.dev/eventing-kafka/pkg/dispatcher/config"
+	commonconfig "knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	kafkaadmin "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/config"
 	"knative.dev/eventing/pkg/logging"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
@@ -71,7 +71,7 @@ func NewController(ctx context.Context, _ configmap.Watcher) *controller.Impl {
 
 	// Create A KafkaChannel Reconciler & Track As Package Variable
 	rec = &Reconciler{
-		logger:               logging.FromContext(ctx),
+		logger:               logger,
 		kubeClientset:        kubeclient.Get(ctx),
 		environment:          environment,
 		config:               configuration,
diff --git a/pkg/controller/kafkachannel/dispatcher.go b/pkg/channel/distributed/controller/kafkachannel/dispatcher.go
similarity index 96%
rename from pkg/controller/kafkachannel/dispatcher.go
rename to pkg/channel/distributed/controller/kafkachannel/dispatcher.go
index 3f237c0b7..13d0f7c6c 100644
--- a/pkg/controller/kafkachannel/dispatcher.go
+++ b/pkg/channel/distributed/controller/kafkachannel/dispatcher.go
@@ -12,12 +12,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/constants"
-	commonenv "knative.dev/eventing-kafka/pkg/common/env"
-	"knative.dev/eventing-kafka/pkg/common/health"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/util"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	commonenv "knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/health"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/system"
diff --git a/pkg/controller/kafkachannel/kafkachannel.go b/pkg/channel/distributed/controller/kafkachannel/kafkachannel.go
similarity index 94%
rename from pkg/controller/kafkachannel/kafkachannel.go
rename to pkg/channel/distributed/controller/kafkachannel/kafkachannel.go
index a85a23adb..9bd43990f 100644
--- a/pkg/controller/kafkachannel/kafkachannel.go
+++ b/pkg/channel/distributed/controller/kafkachannel/kafkachannel.go
@@ -3,11 +3,12 @@ package kafkachannel
 import (
 	"context"
 	"fmt"
+
 	"go.uber.org/zap"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	commonk8s "knative.dev/eventing-kafka/pkg/common/k8s"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/util"
+	commonk8s "knative.dev/eventing-kafka/pkg/channel/distributed/common/k8s"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	"knative.dev/eventing/pkg/apis/messaging"
 )
 
diff --git a/pkg/controller/kafkachannel/reconciler.go b/pkg/channel/distributed/controller/kafkachannel/reconciler.go
similarity index 94%
rename from pkg/controller/kafkachannel/reconciler.go
rename to pkg/channel/distributed/controller/kafkachannel/reconciler.go
index b708d07d8..3b853dc05 100644
--- a/pkg/controller/kafkachannel/reconciler.go
+++ b/pkg/channel/distributed/controller/kafkachannel/reconciler.go
@@ -16,13 +16,13 @@ import (
 	kafkaclientset "knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned"
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/reconciler/messaging/v1beta1/kafkachannel"
 	kafkalisters "knative.dev/eventing-contrib/kafka/channel/pkg/client/listers/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	kafkaadmin "knative.dev/eventing-kafka/pkg/common/kafka/admin"
-	kafkasarama "knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/env"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	kafkaadmin "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin"
+	kafkasarama "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/reconciler"
 )
diff --git a/pkg/controller/kafkachannel/topic.go b/pkg/channel/distributed/controller/kafkachannel/topic.go
similarity index 95%
rename from pkg/controller/kafkachannel/topic.go
rename to pkg/channel/distributed/controller/kafkachannel/topic.go
index ffb8cb8bc..e75657beb 100644
--- a/pkg/controller/kafkachannel/topic.go
+++ b/pkg/channel/distributed/controller/kafkachannel/topic.go
@@ -9,9 +9,9 @@ import (
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	"knative.dev/pkg/controller"
 )
 
diff --git a/pkg/controller/kafkasecret/channel.go b/pkg/channel/distributed/controller/kafkasecret/channel.go
similarity index 96%
rename from pkg/controller/kafkasecret/channel.go
rename to pkg/channel/distributed/controller/kafkasecret/channel.go
index 62ccd6456..90b32e9a7 100644
--- a/pkg/controller/kafkasecret/channel.go
+++ b/pkg/channel/distributed/controller/kafkasecret/channel.go
@@ -11,12 +11,12 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/constants"
-	commonenv "knative.dev/eventing-kafka/pkg/common/env"
-	"knative.dev/eventing-kafka/pkg/common/health"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/util"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	commonenv "knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/health"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/system"
diff --git a/pkg/controller/kafkasecret/controller.go b/pkg/channel/distributed/controller/kafkasecret/controller.go
similarity index 86%
rename from pkg/controller/kafkasecret/controller.go
rename to pkg/channel/distributed/controller/kafkasecret/controller.go
index 94321d4ff..bbe181ba8 100644
--- a/pkg/controller/kafkasecret/controller.go
+++ b/pkg/channel/distributed/controller/kafkasecret/controller.go
@@ -10,13 +10,13 @@ import (
 	"k8s.io/client-go/tools/cache"
 	injectionclient "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client"
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/constants"
-	"knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	"knative.dev/eventing-kafka/pkg/controller/config"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/env"
-	"knative.dev/eventing-kafka/pkg/controller/kafkasecretinformer"
-	"knative.dev/eventing-kafka/pkg/controller/kafkasecretinjection"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkasecretinformer"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkasecretinjection"
 	"knative.dev/eventing/pkg/logging"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
@@ -57,7 +57,7 @@ func NewController(ctx context.Context, _ configmap.Watcher) *controller.Impl {
 
 	// Create The KafkaSecret Reconciler
 	r := &Reconciler{
-		logger:             logging.FromContext(ctx),
+		logger:             logger,
 		kubeClientset:      kubeclient.Get(ctx),
 		config:             configuration,
 		environment:        environment,
diff --git a/pkg/controller/kafkasecret/kafkachannel.go b/pkg/channel/distributed/controller/kafkasecret/kafkachannel.go
similarity index 96%
rename from pkg/controller/kafkasecret/kafkachannel.go
rename to pkg/channel/distributed/controller/kafkasecret/kafkachannel.go
index a9d24474b..5cf7540bd 100644
--- a/pkg/controller/kafkasecret/kafkachannel.go
+++ b/pkg/channel/distributed/controller/kafkasecret/kafkachannel.go
@@ -8,8 +8,8 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	"knative.dev/pkg/reconciler"
 )
 
diff --git a/pkg/controller/kafkasecret/reconciler.go b/pkg/channel/distributed/controller/kafkasecret/reconciler.go
similarity index 90%
rename from pkg/controller/kafkasecret/reconciler.go
rename to pkg/channel/distributed/controller/kafkasecret/reconciler.go
index c94b5b86c..c32f8f391 100644
--- a/pkg/controller/kafkasecret/reconciler.go
+++ b/pkg/channel/distributed/controller/kafkasecret/reconciler.go
@@ -11,11 +11,11 @@ import (
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned"
 	kafkalisters "knative.dev/eventing-contrib/kafka/channel/pkg/client/listers/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/env"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/kafkasecretinjection"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkasecretinjection"
 	"knative.dev/pkg/reconciler"
 )
 
diff --git a/pkg/channel/distributed/controller/kafkasecretinformer/fake/fake.go b/pkg/channel/distributed/controller/kafkasecretinformer/fake/fake.go
new file mode 100644
index 000000000..c99d300e5
--- /dev/null
+++ b/pkg/channel/distributed/controller/kafkasecretinformer/fake/fake.go
@@ -0,0 +1,21 @@
+package fake
+
+import (
+	"context"
+
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkasecretinformer"
+	"knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake" // Knative Fake Informer Injection
+	"knative.dev/pkg/controller"
+	"knative.dev/pkg/injection"
+)
+
+var Get = kafkasecretinformer.Get
+
+func init() {
+	injection.Fake.RegisterInformer(withInformer)
+}
+
+func withInformer(ctx context.Context) (context.Context, controller.Informer) {
+	inf := fake.Get(ctx) // Using Standard Fake Secret Informer
+	return context.WithValue(ctx, kafkasecretinformer.Key{}, inf), inf.Informer()
+}
diff --git a/pkg/controller/kafkasecretinformer/kafkasecretinformer.go b/pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go
similarity index 97%
rename from pkg/controller/kafkasecretinformer/kafkasecretinformer.go
rename to pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go
index bcdde5c58..828ef9577 100644
--- a/pkg/controller/kafkasecretinformer/kafkasecretinformer.go
+++ b/pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer.go
@@ -8,7 +8,7 @@ import (
 	informerscorev1 "k8s.io/client-go/informers/core/v1"
 	listerscorev1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 	"knative.dev/eventing/pkg/logging"
 	"knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/controller"
diff --git a/pkg/controller/kafkasecretinformer/kafkasecretinformer_test.go b/pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer_test.go
similarity index 100%
rename from pkg/controller/kafkasecretinformer/kafkasecretinformer_test.go
rename to pkg/channel/distributed/controller/kafkasecretinformer/kafkasecretinformer_test.go
diff --git a/pkg/controller/kafkasecretinjection/README.md b/pkg/channel/distributed/controller/kafkasecretinjection/README.md
similarity index 100%
rename from pkg/controller/kafkasecretinjection/README.md
rename to pkg/channel/distributed/controller/kafkasecretinjection/README.md
diff --git a/pkg/controller/kafkasecretinjection/controller.go b/pkg/channel/distributed/controller/kafkasecretinjection/controller.go
similarity index 87%
rename from pkg/controller/kafkasecretinjection/controller.go
rename to pkg/channel/distributed/controller/kafkasecretinjection/controller.go
index 9ffa9fd42..a076457df 100644
--- a/pkg/controller/kafkasecretinjection/controller.go
+++ b/pkg/channel/distributed/controller/kafkasecretinjection/controller.go
@@ -1,25 +1,25 @@
 package kafkasecretinjection
 
 import (
-	context "context"
-	fmt "fmt"
-	"knative.dev/eventing-kafka/pkg/controller/kafkasecretinformer"
-	"knative.dev/eventing-kafka/pkg/controller/util"
-	reflect "reflect"
-	strings "strings"
+	"context"
+	"fmt"
+	"reflect"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	scheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/kubernetes/scheme"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	record "k8s.io/client-go/tools/record"
+	"k8s.io/client-go/tools/record"
 	versionedscheme "knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned/scheme"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkasecretinformer"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
-	controller "knative.dev/pkg/controller"
-	logging "knative.dev/pkg/logging"
-	reconciler "knative.dev/pkg/reconciler"
+	"knative.dev/pkg/controller"
+	"knative.dev/pkg/logging"
+	"knative.dev/pkg/reconciler"
 )
 
 // Code manually created based on generated implementation in eventing-contrib/kafka - SEE README !!!
diff --git a/pkg/controller/util/channel.go b/pkg/channel/distributed/controller/util/channel.go
similarity index 96%
rename from pkg/controller/util/channel.go
rename to pkg/channel/distributed/controller/util/channel.go
index d0c3c231f..d7ae01924 100644
--- a/pkg/controller/util/channel.go
+++ b/pkg/channel/distributed/controller/util/channel.go
@@ -7,8 +7,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 	"knative.dev/eventing/pkg/utils"
 )
 
diff --git a/pkg/controller/util/dispatcher.go b/pkg/channel/distributed/controller/util/dispatcher.go
similarity index 100%
rename from pkg/controller/util/dispatcher.go
rename to pkg/channel/distributed/controller/util/dispatcher.go
diff --git a/pkg/controller/util/dispatcher_test.go b/pkg/channel/distributed/controller/util/dispatcher_test.go
similarity index 100%
rename from pkg/controller/util/dispatcher_test.go
rename to pkg/channel/distributed/controller/util/dispatcher_test.go
diff --git a/pkg/controller/util/dns.go b/pkg/channel/distributed/controller/util/dns.go
similarity index 100%
rename from pkg/controller/util/dns.go
rename to pkg/channel/distributed/controller/util/dns.go
diff --git a/pkg/controller/util/dns_test.go b/pkg/channel/distributed/controller/util/dns_test.go
similarity index 100%
rename from pkg/controller/util/dns_test.go
rename to pkg/channel/distributed/controller/util/dns_test.go
diff --git a/pkg/controller/util/finalizer.go b/pkg/channel/distributed/controller/util/finalizer.go
similarity index 94%
rename from pkg/controller/util/finalizer.go
rename to pkg/channel/distributed/controller/util/finalizer.go
index 52a6e0049..e2aef4f0e 100644
--- a/pkg/controller/util/finalizer.go
+++ b/pkg/channel/distributed/controller/util/finalizer.go
@@ -1,7 +1,7 @@
 package util
 
 import (
-	"knative.dev/eventing-kafka/pkg/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 )
 
 //
diff --git a/pkg/controller/util/hash.go b/pkg/channel/distributed/controller/util/hash.go
similarity index 100%
rename from pkg/controller/util/hash.go
rename to pkg/channel/distributed/controller/util/hash.go
diff --git a/pkg/controller/util/hash_test.go b/pkg/channel/distributed/controller/util/hash_test.go
similarity index 100%
rename from pkg/controller/util/hash_test.go
rename to pkg/channel/distributed/controller/util/hash_test.go
diff --git a/pkg/controller/util/secret.go b/pkg/channel/distributed/controller/util/secret.go
similarity index 93%
rename from pkg/controller/util/secret.go
rename to pkg/channel/distributed/controller/util/secret.go
index c7c7f94b8..969a0c6fd 100644
--- a/pkg/controller/util/secret.go
+++ b/pkg/channel/distributed/controller/util/secret.go
@@ -5,7 +5,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 )
 
 // Get A Logger With Secret Info
diff --git a/pkg/controller/util/subscription.go b/pkg/channel/distributed/controller/util/subscription.go
similarity index 91%
rename from pkg/controller/util/subscription.go
rename to pkg/channel/distributed/controller/util/subscription.go
index ee0f992df..f8326fe2c 100644
--- a/pkg/controller/util/subscription.go
+++ b/pkg/channel/distributed/controller/util/subscription.go
@@ -4,7 +4,7 @@ import (
 	"go.uber.org/zap"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 	messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
 )
 
diff --git a/pkg/controller/util/topic.go b/pkg/channel/distributed/controller/util/topic.go
similarity index 78%
rename from pkg/controller/util/topic.go
rename to pkg/channel/distributed/controller/util/topic.go
index 594476175..59d8e6eef 100644
--- a/pkg/controller/util/topic.go
+++ b/pkg/channel/distributed/controller/util/topic.go
@@ -2,7 +2,7 @@ package util
 
 import (
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	commonkafkautil "knative.dev/eventing-kafka/pkg/common/kafka/util"
+	commonkafkautil "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/util"
 )
 
 // Get The TopicName For Specified KafkaChannel (ChannelNamespace.ChannelName)
diff --git a/pkg/controller/util/topic_test.go b/pkg/channel/distributed/controller/util/topic_test.go
similarity index 100%
rename from pkg/controller/util/topic_test.go
rename to pkg/channel/distributed/controller/util/topic_test.go
diff --git a/pkg/dispatcher/README.md b/pkg/channel/distributed/dispatcher/README.md
similarity index 100%
rename from pkg/dispatcher/README.md
rename to pkg/channel/distributed/dispatcher/README.md
diff --git a/pkg/dispatcher/config/config.go b/pkg/channel/distributed/dispatcher/config/config.go
similarity index 92%
rename from pkg/dispatcher/config/config.go
rename to pkg/channel/distributed/dispatcher/config/config.go
index 5381bb854..bf25f9578 100644
--- a/pkg/dispatcher/config/config.go
+++ b/pkg/channel/distributed/dispatcher/config/config.go
@@ -1,8 +1,8 @@
 package config
 
 import (
-	"knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/dispatcher/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/constants"
 )
 
 // ConfigurationError is the type of error returned from VerifyOverrides
diff --git a/pkg/dispatcher/constants/constants.go b/pkg/channel/distributed/dispatcher/constants/constants.go
similarity index 100%
rename from pkg/dispatcher/constants/constants.go
rename to pkg/channel/distributed/dispatcher/constants/constants.go
diff --git a/pkg/dispatcher/controller/kafkachannel.go b/pkg/channel/distributed/dispatcher/controller/kafkachannel.go
similarity index 99%
rename from pkg/dispatcher/controller/kafkachannel.go
rename to pkg/channel/distributed/dispatcher/controller/kafkachannel.go
index 206ffa26d..20fb77a1a 100644
--- a/pkg/dispatcher/controller/kafkachannel.go
+++ b/pkg/channel/distributed/dispatcher/controller/kafkachannel.go
@@ -16,7 +16,7 @@ import (
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned/scheme"
 	informers "knative.dev/eventing-contrib/kafka/channel/pkg/client/informers/externalversions/messaging/v1beta1"
 	listers "knative.dev/eventing-contrib/kafka/channel/pkg/client/listers/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/dispatcher/dispatcher"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/dispatcher"
 	eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
diff --git a/pkg/dispatcher/dispatcher/dispatcher.go b/pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go
similarity index 97%
rename from pkg/dispatcher/dispatcher/dispatcher.go
rename to pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go
index 283a85691..a97bed0f2 100644
--- a/pkg/dispatcher/dispatcher/dispatcher.go
+++ b/pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go
@@ -9,9 +9,9 @@ import (
 	"go.uber.org/zap"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"knative.dev/eventing-kafka/pkg/common/kafka/consumer"
-	kafkasarama "knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	"knative.dev/eventing-kafka/pkg/common/metrics"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/consumer"
+	kafkasarama "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/metrics"
 	eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
 	"knative.dev/eventing/pkg/channel"
 )
diff --git a/pkg/dispatcher/env/environment.go b/pkg/channel/distributed/dispatcher/env/environment.go
similarity index 97%
rename from pkg/dispatcher/env/environment.go
rename to pkg/channel/distributed/dispatcher/env/environment.go
index e5593bf2e..f0fed2b83 100644
--- a/pkg/dispatcher/env/environment.go
+++ b/pkg/channel/distributed/dispatcher/env/environment.go
@@ -2,7 +2,7 @@ package env
 
 import (
 	"go.uber.org/zap"
-	"knative.dev/eventing-kafka/pkg/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
 )
 
 // Environment Structure
diff --git a/pkg/dispatcher/health/health.go b/pkg/channel/distributed/dispatcher/health/health.go
similarity index 95%
rename from pkg/dispatcher/health/health.go
rename to pkg/channel/distributed/dispatcher/health/health.go
index 3344a02c9..ecda83a83 100644
--- a/pkg/dispatcher/health/health.go
+++ b/pkg/channel/distributed/dispatcher/health/health.go
@@ -1,8 +1,9 @@
 package health
 
 import (
-	"knative.dev/eventing-kafka/pkg/common/health"
 	"sync"
+
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/health"
 )
 
 // Start The HTTP Server Listening For Requests
diff --git a/pkg/dispatcher/health/health_test.go b/pkg/channel/distributed/dispatcher/health/health_test.go
similarity index 100%
rename from pkg/dispatcher/health/health_test.go
rename to pkg/channel/distributed/dispatcher/health/health_test.go
diff --git a/pkg/dispatcher/testing/factory.go b/pkg/channel/distributed/dispatcher/testing/factory.go
similarity index 100%
rename from pkg/dispatcher/testing/factory.go
rename to pkg/channel/distributed/dispatcher/testing/factory.go
diff --git a/pkg/dispatcher/testing/kafkachannel.go b/pkg/channel/distributed/dispatcher/testing/kafkachannel.go
similarity index 100%
rename from pkg/dispatcher/testing/kafkachannel.go
rename to pkg/channel/distributed/dispatcher/testing/kafkachannel.go
diff --git a/pkg/dispatcher/testing/listers.go b/pkg/channel/distributed/dispatcher/testing/listers.go
similarity index 100%
rename from pkg/dispatcher/testing/listers.go
rename to pkg/channel/distributed/dispatcher/testing/listers.go
diff --git a/pkg/dispatcher/testing/mocks.go b/pkg/channel/distributed/dispatcher/testing/mocks.go
similarity index 100%
rename from pkg/dispatcher/testing/mocks.go
rename to pkg/channel/distributed/dispatcher/testing/mocks.go
diff --git a/hack/controller-local-env.sh b/pkg/channel/distributed/hack/controller-local-env.sh
similarity index 100%
rename from hack/controller-local-env.sh
rename to pkg/channel/distributed/hack/controller-local-env.sh
diff --git a/hack/dispatcher-local-env.sh b/pkg/channel/distributed/hack/dispatcher-local-env.sh
similarity index 100%
rename from hack/dispatcher-local-env.sh
rename to pkg/channel/distributed/hack/dispatcher-local-env.sh
diff --git a/pkg/channel/README.md b/pkg/channel/distributed/receiver/README.md
similarity index 100%
rename from pkg/channel/README.md
rename to pkg/channel/distributed/receiver/README.md
diff --git a/pkg/channel/channel/channel.go b/pkg/channel/distributed/receiver/channel/channel.go
similarity index 92%
rename from pkg/channel/channel/channel.go
rename to pkg/channel/distributed/receiver/channel/channel.go
index a3cfa95a2..e27011abe 100644
--- a/pkg/channel/channel/channel.go
+++ b/pkg/channel/distributed/receiver/channel/channel.go
@@ -9,7 +9,7 @@ import (
 	kafkaclientset "knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned"
 	kafkainformers "knative.dev/eventing-contrib/kafka/channel/pkg/client/informers/externalversions"
 	kafkalisters "knative.dev/eventing-contrib/kafka/channel/pkg/client/listers/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/channel/health"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/health"
 	eventingChannel "knative.dev/eventing/pkg/channel"
 	knativecontroller "knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
@@ -23,10 +23,10 @@ var (
 )
 
 // Wrapper Around Kafka Client Creation To Facilitate Unit Testing
-var getKafkaClient = func(ctx context.Context, masterUrl string, kubeconfigPath string) (kafkaclientset.Interface, error) {
+var getKafkaClient = func(ctx context.Context, serverUrl string, kubeconfigPath string) (kafkaclientset.Interface, error) {
 
 	// Create The K8S Configuration (In-Cluster With Cmd Line Flags For Out-Of-Cluster Usage)
-	k8sConfig, err := k8sclientcmd.BuildConfigFromFlags(masterUrl, kubeconfigPath)
+	k8sConfig, err := k8sclientcmd.BuildConfigFromFlags(serverUrl, kubeconfigPath)
 	if err != nil {
 		logging.FromContext(ctx).Error("Failed To Build Kubernetes Config", zap.Error(err))
 		return nil, err
@@ -37,13 +37,13 @@ var getKafkaClient = func(ctx context.Context, masterUrl string, kubeconfigPath
 }
 
 // Initialize The KafkaChannel Lister Singleton
-func InitializeKafkaChannelLister(ctx context.Context, masterUrl string, kubeconfigPath string, healthServer *health.Server) error {
+func InitializeKafkaChannelLister(ctx context.Context, serverUrl string, kubeconfigPath string, healthServer *health.Server) error {
 
 	// Get The Logger From The Provided Context
 	logger = logging.FromContext(ctx).Desugar()
 
 	// Get The K8S Kafka Client For KafkaChannels
-	client, err := getKafkaClient(ctx, masterUrl, kubeconfigPath)
+	client, err := getKafkaClient(ctx, serverUrl, kubeconfigPath)
 	if err != nil {
 		logger.Error("Failed To Create Kafka Client", zap.Error(err))
 		return err
diff --git a/pkg/channel/constants/constants.go b/pkg/channel/distributed/receiver/constants/constants.go
similarity index 100%
rename from pkg/channel/constants/constants.go
rename to pkg/channel/distributed/receiver/constants/constants.go
diff --git a/pkg/channel/env/environment.go b/pkg/channel/distributed/receiver/env/environment.go
similarity index 97%
rename from pkg/channel/env/environment.go
rename to pkg/channel/distributed/receiver/env/environment.go
index dbb2c1e66..3a4c5082c 100644
--- a/pkg/channel/env/environment.go
+++ b/pkg/channel/distributed/receiver/env/environment.go
@@ -2,7 +2,7 @@ package env
 
 import (
 	"go.uber.org/zap"
-	"knative.dev/eventing-kafka/pkg/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
 )
 
 // The Environment Struct
diff --git a/pkg/channel/health/health.go b/pkg/channel/distributed/receiver/health/health.go
similarity index 96%
rename from pkg/channel/health/health.go
rename to pkg/channel/distributed/receiver/health/health.go
index addf72b05..b7351ca1d 100644
--- a/pkg/channel/health/health.go
+++ b/pkg/channel/distributed/receiver/health/health.go
@@ -1,8 +1,9 @@
 package health
 
 import (
-	"knative.dev/eventing-kafka/pkg/common/health"
 	"sync"
+
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/health"
 )
 
 // Start The HTTP Server Listening For Requests
diff --git a/pkg/channel/health/health_test.go b/pkg/channel/distributed/receiver/health/health_test.go
similarity index 100%
rename from pkg/channel/health/health_test.go
rename to pkg/channel/distributed/receiver/health/health_test.go
diff --git a/pkg/channel/producer/producer.go b/pkg/channel/distributed/receiver/producer/producer.go
similarity index 94%
rename from pkg/channel/producer/producer.go
rename to pkg/channel/distributed/receiver/producer/producer.go
index 000b4f5eb..b46193d06 100644
--- a/pkg/channel/producer/producer.go
+++ b/pkg/channel/distributed/receiver/producer/producer.go
@@ -11,12 +11,12 @@ import (
 	gometrics "github.com/rcrowley/go-metrics"
 	"go.uber.org/zap"
 	v1 "k8s.io/api/core/v1"
-	"knative.dev/eventing-kafka/pkg/channel/constants"
-	"knative.dev/eventing-kafka/pkg/channel/health"
-	"knative.dev/eventing-kafka/pkg/channel/util"
-	kafkaproducer "knative.dev/eventing-kafka/pkg/common/kafka/producer"
-	kafkasarama "knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	"knative.dev/eventing-kafka/pkg/common/metrics"
+	kafkaproducer "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/producer"
+	kafkasarama "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/metrics"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/health"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/util"
 	eventingChannel "knative.dev/eventing/pkg/channel"
 )
 
diff --git a/pkg/channel/test/message.go b/pkg/channel/distributed/receiver/test/message.go
similarity index 100%
rename from pkg/channel/test/message.go
rename to pkg/channel/distributed/receiver/test/message.go
diff --git a/pkg/channel/test/mock.go b/pkg/channel/distributed/receiver/test/mock.go
similarity index 100%
rename from pkg/channel/test/mock.go
rename to pkg/channel/distributed/receiver/test/mock.go
diff --git a/pkg/channel/util/util.go b/pkg/channel/distributed/receiver/util/util.go
similarity index 78%
rename from pkg/channel/util/util.go
rename to pkg/channel/distributed/receiver/util/util.go
index ed5e7f62b..69926a40f 100644
--- a/pkg/channel/util/util.go
+++ b/pkg/channel/distributed/receiver/util/util.go
@@ -1,7 +1,7 @@
 package util
 
 import (
-	commonkafkautil "knative.dev/eventing-kafka/pkg/common/kafka/util"
+	commonkafkautil "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/util"
 	eventingChannel "knative.dev/eventing/pkg/channel"
 )
 
diff --git a/pkg/channel/util/util_test.go b/pkg/channel/distributed/receiver/util/util_test.go
similarity index 100%
rename from pkg/channel/util/util_test.go
rename to pkg/channel/distributed/receiver/util/util_test.go
diff --git a/pkg/client/README.md b/pkg/client/README.md
new file mode 100644
index 000000000..96cacc9f0
--- /dev/null
+++ b/pkg/client/README.md
@@ -0,0 +1,1 @@
+# TODO - Add common code from various implementations here
diff --git a/pkg/source/README.md b/pkg/source/README.md
new file mode 100644
index 000000000..746dcee11
--- /dev/null
+++ b/pkg/source/README.md
@@ -0,0 +1,1 @@
+TODO - eventing-contrib/kafka source here !
diff --git a/vendor/knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/factory/fake/fake.go b/vendor/knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/factory/fake/fake.go
new file mode 100644
index 000000000..9e738705e
--- /dev/null
+++ b/vendor/knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/factory/fake/fake.go
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	context "context"
+
+	externalversions "knative.dev/eventing-contrib/kafka/channel/pkg/client/informers/externalversions"
+	fake "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client/fake"
+	factory "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/factory"
+	controller "knative.dev/pkg/controller"
+	injection "knative.dev/pkg/injection"
+)
+
+var Get = factory.Get
+
+func init() {
+	injection.Fake.RegisterInformerFactory(withInformerFactory)
+}
+
+func withInformerFactory(ctx context.Context) context.Context {
+	c := fake.Get(ctx)
+	opts := make([]externalversions.SharedInformerOption, 0, 1)
+	if injection.HasNamespaceScope(ctx) {
+		opts = append(opts, externalversions.WithNamespace(injection.GetNamespaceScope(ctx)))
+	}
+	return context.WithValue(ctx, factory.Key{},
+		externalversions.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx), opts...))
+}
diff --git a/vendor/knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel/fake/fake.go b/vendor/knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel/fake/fake.go
new file mode 100644
index 000000000..615093dcc
--- /dev/null
+++ b/vendor/knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel/fake/fake.go
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	context "context"
+
+	fake "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/factory/fake"
+	kafkachannel "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel"
+	controller "knative.dev/pkg/controller"
+	injection "knative.dev/pkg/injection"
+)
+
+var Get = kafkachannel.Get
+
+func init() {
+	injection.Fake.RegisterInformer(withInformer)
+}
+
+func withInformer(ctx context.Context) (context.Context, controller.Informer) {
+	f := fake.Get(ctx)
+	inf := f.Messaging().V1beta1().KafkaChannels()
+	return context.WithValue(ctx, kafkachannel.Key{}, inf), inf.Informer()
+}
diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake/fake.go
new file mode 100644
index 000000000..88de49807
--- /dev/null
+++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake/fake.go
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	context "context"
+
+	deployment "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
+	fake "knative.dev/pkg/client/injection/kube/informers/factory/fake"
+	controller "knative.dev/pkg/controller"
+	injection "knative.dev/pkg/injection"
+)
+
+var Get = deployment.Get
+
+func init() {
+	injection.Fake.RegisterInformer(withInformer)
+}
+
+func withInformer(ctx context.Context) (context.Context, controller.Informer) {
+	f := fake.Get(ctx)
+	inf := f.Apps().V1().Deployments()
+	return context.WithValue(ctx, deployment.Key{}, inf), inf.Informer()
+}
diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go
new file mode 100644
index 000000000..48b2532d7
--- /dev/null
+++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	context "context"
+
+	secret "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
+	fake "knative.dev/pkg/client/injection/kube/informers/factory/fake"
+	controller "knative.dev/pkg/controller"
+	injection "knative.dev/pkg/injection"
+)
+
+var Get = secret.Get
+
+func init() {
+	injection.Fake.RegisterInformer(withInformer)
+}
+
+func withInformer(ctx context.Context) (context.Context, controller.Informer) {
+	f := fake.Get(ctx)
+	inf := f.Core().V1().Secrets()
+	return context.WithValue(ctx, secret.Key{}, inf), inf.Informer()
+}
diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go
new file mode 100644
index 000000000..5442d08b7
--- /dev/null
+++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go
@@ -0,0 +1,52 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package secret
+
+import (
+	context "context"
+
+	v1 "k8s.io/client-go/informers/core/v1"
+	factory "knative.dev/pkg/client/injection/kube/informers/factory"
+	controller "knative.dev/pkg/controller"
+	injection "knative.dev/pkg/injection"
+	logging "knative.dev/pkg/logging"
+)
+
+func init() {
+	injection.Default.RegisterInformer(withInformer)
+}
+
+// Key is used for associating the Informer inside the context.Context.
+type Key struct{}
+
+func withInformer(ctx context.Context) (context.Context, controller.Informer) {
+	f := factory.Get(ctx)
+	inf := f.Core().V1().Secrets()
+	return context.WithValue(ctx, Key{}, inf), inf.Informer()
+}
+
+// Get extracts the typed informer from the context.
+func Get(ctx context.Context) v1.SecretInformer {
+	untyped := ctx.Value(Key{})
+	if untyped == nil {
+		logging.FromContext(ctx).Panic(
+			"Unable to fetch k8s.io/client-go/informers/core/v1.SecretInformer from context.")
+	}
+	return untyped.(v1.SecretInformer)
+}
diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake/fake.go
new file mode 100644
index 000000000..d7ecc65b5
--- /dev/null
+++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake/fake.go
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	context "context"
+
+	service "knative.dev/pkg/client/injection/kube/informers/core/v1/service"
+	fake "knative.dev/pkg/client/injection/kube/informers/factory/fake"
+	controller "knative.dev/pkg/controller"
+	injection "knative.dev/pkg/injection"
+)
+
+var Get = service.Get
+
+func init() {
+	injection.Fake.RegisterInformer(withInformer)
+}
+
+func withInformer(ctx context.Context) (context.Context, controller.Informer) {
+	f := fake.Get(ctx)
+	inf := f.Core().V1().Services()
+	return context.WithValue(ctx, service.Key{}, inf), inf.Informer()
+}
diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/factory/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/factory/fake/fake.go
new file mode 100644
index 000000000..5784115fe
--- /dev/null
+++ b/vendor/knative.dev/pkg/client/injection/kube/informers/factory/fake/fake.go
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by injection-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	context "context"
+
+	informers "k8s.io/client-go/informers"
+	fake "knative.dev/pkg/client/injection/kube/client/fake"
+	factory "knative.dev/pkg/client/injection/kube/informers/factory"
+	controller "knative.dev/pkg/controller"
+	injection "knative.dev/pkg/injection"
+)
+
+var Get = factory.Get
+
+func init() {
+	injection.Fake.RegisterInformerFactory(withInformerFactory)
+}
+
+func withInformerFactory(ctx context.Context) context.Context {
+	c := fake.Get(ctx)
+	opts := make([]informers.SharedInformerOption, 0, 1)
+	if injection.HasNamespaceScope(ctx) {
+		opts = append(opts, informers.WithNamespace(injection.GetNamespaceScope(ctx)))
+	}
+	return context.WithValue(ctx, factory.Key{},
+		informers.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx), opts...))
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index e09a0ce2c..9054bc3e4 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -652,8 +652,6 @@ honnef.co/go/tools/staticcheck
 honnef.co/go/tools/stylecheck
 honnef.co/go/tools/unused
 honnef.co/go/tools/version
-# istio.io/gogo-genproto v0.0.0-20191029161641-f7d19ec0141d
-## explicit
 # k8s.io/api v0.18.7-rc.0 => k8s.io/api v0.17.6
 ## explicit
 k8s.io/api/admission/v1
@@ -1096,7 +1094,9 @@ knative.dev/eventing-contrib/kafka/channel/pkg/client/informers/externalversions
 knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client
 knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client/fake
 knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/factory
+knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/factory/fake
 knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel
+knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel/fake
 knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/reconciler/messaging/v1beta1/kafkachannel
 knative.dev/eventing-contrib/kafka/channel/pkg/client/listers/messaging/v1alpha1
 knative.dev/eventing-contrib/kafka/channel/pkg/client/listers/messaging/v1beta1
@@ -1114,8 +1114,13 @@ knative.dev/pkg/changeset
 knative.dev/pkg/client/injection/kube/client
 knative.dev/pkg/client/injection/kube/client/fake
 knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment
+knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake
+knative.dev/pkg/client/injection/kube/informers/core/v1/secret
+knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake
 knative.dev/pkg/client/injection/kube/informers/core/v1/service
+knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake
 knative.dev/pkg/client/injection/kube/informers/factory
+knative.dev/pkg/client/injection/kube/informers/factory/fake
 knative.dev/pkg/codegen/cmd/injection-gen
 knative.dev/pkg/codegen/cmd/injection-gen/args
 knative.dev/pkg/codegen/cmd/injection-gen/generators


Test patch:
diff --git a/pkg/common/config/configwatcher.go b/pkg/channel/distributed/common/config/configwatcher.go
similarity index 100%
rename from pkg/common/config/configwatcher.go
rename to pkg/channel/distributed/common/config/configwatcher.go
diff --git a/pkg/common/config/configwatcher_test.go b/pkg/channel/distributed/common/config/configwatcher_test.go
similarity index 96%
rename from pkg/common/config/configwatcher_test.go
rename to pkg/channel/distributed/common/config/configwatcher_test.go
index f8111dd1d..f3ccd3cc8 100644
--- a/pkg/common/config/configwatcher_test.go
+++ b/pkg/channel/distributed/common/config/configwatcher_test.go
@@ -11,8 +11,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/constants"
-	commontesting "knative.dev/eventing-kafka/pkg/common/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
 	injectionclient "knative.dev/pkg/client/injection/kube/client"
 	logtesting "knative.dev/pkg/logging/testing"
 	"knative.dev/pkg/system"
diff --git a/pkg/common/config/constants.go b/pkg/channel/distributed/common/config/constants.go
similarity index 100%
rename from pkg/common/config/constants.go
rename to pkg/channel/distributed/common/config/constants.go
diff --git a/pkg/common/config/observability.go b/pkg/channel/distributed/common/config/observability.go
similarity index 100%
rename from pkg/common/config/observability.go
rename to pkg/channel/distributed/common/config/observability.go
diff --git a/pkg/common/config/observability_test.go b/pkg/channel/distributed/common/config/observability_test.go
similarity index 91%
rename from pkg/common/config/observability_test.go
rename to pkg/channel/distributed/common/config/observability_test.go
index cf25d39ad..1f2953f1d 100644
--- a/pkg/common/config/observability_test.go
+++ b/pkg/channel/distributed/common/config/observability_test.go
@@ -11,9 +11,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/constants"
-	"knative.dev/eventing-kafka/pkg/common/env"
-	commontesting "knative.dev/eventing-kafka/pkg/common/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
 	injectionclient "knative.dev/pkg/client/injection/kube/client"
 	logtesting "knative.dev/pkg/logging/testing"
 	"knative.dev/pkg/metrics"
diff --git a/pkg/common/config/tracing.go b/pkg/channel/distributed/common/config/tracing.go
similarity index 100%
rename from pkg/common/config/tracing.go
rename to pkg/channel/distributed/common/config/tracing.go
diff --git a/pkg/common/config/tracing_test.go b/pkg/channel/distributed/common/config/tracing_test.go
similarity index 97%
rename from pkg/common/config/tracing_test.go
rename to pkg/channel/distributed/common/config/tracing_test.go
index a1b6f386b..204664453 100644
--- a/pkg/common/config/tracing_test.go
+++ b/pkg/channel/distributed/common/config/tracing_test.go
@@ -9,7 +9,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
 	injectionclient "knative.dev/pkg/client/injection/kube/client"
 	logtesting "knative.dev/pkg/logging/testing"
 	"knative.dev/pkg/system"
diff --git a/pkg/common/k8s/context_test.go b/pkg/channel/distributed/common/k8s/context_test.go
similarity index 88%
rename from pkg/common/k8s/context_test.go
rename to pkg/channel/distributed/common/k8s/context_test.go
index 286f7ef0f..1b07e0f2a 100644
--- a/pkg/common/k8s/context_test.go
+++ b/pkg/channel/distributed/common/k8s/context_test.go
@@ -11,8 +11,8 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/constants"
-	"knative.dev/eventing-kafka/pkg/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/system"
@@ -46,8 +46,8 @@ func TestLoggingContext(t *testing.T) {
 
 	// Temporarily Swap The K8S Client Wrapper For Testing
 	k8sClientWrapperRef := K8sClientWrapper
-	K8sClientWrapper = func(masterUrlArg string, kubeconfigPathArg string) kubernetes.Interface {
-		assert.Empty(t, masterUrlArg)
+	K8sClientWrapper = func(serverUrlArg string, kubeconfigPathArg string) kubernetes.Interface {
+		assert.Empty(t, serverUrlArg)
 		assert.Empty(t, kubeconfigPathArg)
 		return fakeK8sClient
 	}
diff --git a/pkg/common/kafka/admin/admin_custom_test.go b/pkg/channel/distributed/common/kafka/admin/admin_custom_test.go
similarity index 98%
rename from pkg/common/kafka/admin/admin_custom_test.go
rename to pkg/channel/distributed/common/kafka/admin/admin_custom_test.go
index 3ed8a6ad6..abf2cd2a7 100644
--- a/pkg/common/kafka/admin/admin_custom_test.go
+++ b/pkg/channel/distributed/common/kafka/admin/admin_custom_test.go
@@ -13,8 +13,8 @@ import (
 	"testing"
 
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/kafka/admin/custom"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin/custom"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 	injectionclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/logging"
 	logtesting "knative.dev/pkg/logging/testing"
diff --git a/pkg/common/kafka/admin/admin_eventhub_test.go b/pkg/channel/distributed/common/kafka/admin/admin_eventhub_test.go
similarity index 99%
rename from pkg/common/kafka/admin/admin_eventhub_test.go
rename to pkg/channel/distributed/common/kafka/admin/admin_eventhub_test.go
index c6b448894..af1bdbc55 100644
--- a/pkg/common/kafka/admin/admin_eventhub_test.go
+++ b/pkg/channel/distributed/common/kafka/admin/admin_eventhub_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/Shopify/sarama"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"knative.dev/eventing-kafka/pkg/common/kafka/admin/eventhubcache"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin/eventhubcache"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 	logtesting "knative.dev/pkg/logging/testing"
 	"strconv"
 	"testing"
diff --git a/pkg/common/kafka/admin/admin_kafka_test.go b/pkg/channel/distributed/common/kafka/admin/admin_kafka_test.go
similarity index 97%
rename from pkg/common/kafka/admin/admin_kafka_test.go
rename to pkg/channel/distributed/common/kafka/admin/admin_kafka_test.go
index 549456827..a7f6578b9 100644
--- a/pkg/common/kafka/admin/admin_kafka_test.go
+++ b/pkg/channel/distributed/common/kafka/admin/admin_kafka_test.go
@@ -10,11 +10,11 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/constants"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
-	kafkasarama "knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	commontesting "knative.dev/eventing-kafka/pkg/common/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
+	kafkasarama "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
 	injectionclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/logging"
 	logtesting "knative.dev/pkg/logging/testing"
diff --git a/pkg/common/kafka/admin/admin_test.go b/pkg/channel/distributed/common/kafka/admin/admin_test.go
similarity index 94%
rename from pkg/common/kafka/admin/admin_test.go
rename to pkg/channel/distributed/common/kafka/admin/admin_test.go
index fc5b82656..be844e327 100644
--- a/pkg/common/kafka/admin/admin_test.go
+++ b/pkg/channel/distributed/common/kafka/admin/admin_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/Shopify/sarama"
 	"github.com/stretchr/testify/assert"
-	"knative.dev/eventing-kafka/pkg/common/constants"
-	kafkasarama "knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	commontesting "knative.dev/eventing-kafka/pkg/common/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	kafkasarama "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
 )
 
 // Mock AdminClient Reference
diff --git a/pkg/common/kafka/admin/eventhubcache/cache_test.go b/pkg/channel/distributed/common/kafka/admin/eventhubcache/cache_test.go
similarity index 99%
rename from pkg/common/kafka/admin/eventhubcache/cache_test.go
rename to pkg/channel/distributed/common/kafka/admin/eventhubcache/cache_test.go
index 2c9fc61b9..6687871a1 100644
--- a/pkg/common/kafka/admin/eventhubcache/cache_test.go
+++ b/pkg/channel/distributed/common/kafka/admin/eventhubcache/cache_test.go
@@ -9,7 +9,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 	injectionclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/logging"
 	logtesting "knative.dev/pkg/logging/testing"
diff --git a/pkg/common/kafka/admin/eventhubcache/hubmanager.go b/pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go
similarity index 100%
rename from pkg/common/kafka/admin/eventhubcache/hubmanager.go
rename to pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager.go
diff --git a/pkg/common/kafka/admin/eventhubcache/hubmanager_test.go b/pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager_test.go
similarity index 58%
rename from pkg/common/kafka/admin/eventhubcache/hubmanager_test.go
rename to pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager_test.go
index 1181343d8..e3c288188 100644
--- a/pkg/common/kafka/admin/eventhubcache/hubmanager_test.go
+++ b/pkg/channel/distributed/common/kafka/admin/eventhubcache/hubmanager_test.go
@@ -2,9 +2,30 @@ package eventhubcache
 
 import (
 	"context"
+	"testing"
+
 	eventhub "github.com/Azure/azure-event-hubs-go"
+	"github.com/stretchr/testify/assert"
 )
 
+//
+// Test The NewHubManagerFromConnectionStringWrapper() Constructor
+//
+// This semi-pointless test is here to pacify the OCD Knative coverage tools,
+// which (as of this writing) only consider coverage from a file with the
+// same name and "_test" suffix instead of all tests aggregated as the Go
+// cmd line tooling does.
+//
+func TestFoo(t *testing.T) {
+	hubManager, err := NewHubManagerFromConnectionStringWrapper("foo")
+	assert.NotNil(t, err)
+	assert.Nil(t, hubManager)
+}
+
+//
+// Mock HubManager
+//
+
 // Verify The Mock HubManager Implements The HubManagerInterface
 var _ HubManagerInterface = &MockHubManager{}
 
diff --git a/pkg/common/kafka/admin/eventhubcache/namespace_test.go b/pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace_test.go
similarity index 98%
rename from pkg/common/kafka/admin/eventhubcache/namespace_test.go
rename to pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace_test.go
index a87584b95..33df5f3cc 100644
--- a/pkg/common/kafka/admin/eventhubcache/namespace_test.go
+++ b/pkg/channel/distributed/common/kafka/admin/eventhubcache/namespace_test.go
@@ -5,7 +5,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 	logtesting "knative.dev/pkg/logging/testing"
 	"testing"
 )
diff --git a/pkg/common/kafka/admin/util/util_test.go b/pkg/channel/distributed/common/kafka/admin/util/util_test.go
similarity index 98%
rename from pkg/common/kafka/admin/util/util_test.go
rename to pkg/channel/distributed/common/kafka/admin/util/util_test.go
index 87595bfeb..9c5336620 100644
--- a/pkg/common/kafka/admin/util/util_test.go
+++ b/pkg/channel/distributed/common/kafka/admin/util/util_test.go
@@ -7,7 +7,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 	logtesting "knative.dev/pkg/logging/testing"
 	"testing"
 )
diff --git a/pkg/common/kafka/constants/constants.go b/pkg/channel/distributed/common/kafka/constants/constants.go
similarity index 100%
rename from pkg/common/kafka/constants/constants.go
rename to pkg/channel/distributed/common/kafka/constants/constants.go
diff --git a/pkg/common/kafka/consumer/consumer.go b/pkg/channel/distributed/common/kafka/consumer/consumer.go
similarity index 100%
rename from pkg/common/kafka/consumer/consumer.go
rename to pkg/channel/distributed/common/kafka/consumer/consumer.go
diff --git a/pkg/common/kafka/consumer/consumer_test.go b/pkg/channel/distributed/common/kafka/consumer/consumer_test.go
similarity index 88%
rename from pkg/common/kafka/consumer/consumer_test.go
rename to pkg/channel/distributed/common/kafka/consumer/consumer_test.go
index af18ecea4..ce0e34f45 100644
--- a/pkg/common/kafka/consumer/consumer_test.go
+++ b/pkg/channel/distributed/common/kafka/consumer/consumer_test.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/Shopify/sarama"
 	"github.com/stretchr/testify/assert"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
-	kafkasarama "knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	kafkatesting "knative.dev/eventing-kafka/pkg/common/kafka/testing"
-	commontesting "knative.dev/eventing-kafka/pkg/common/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
+	kafkasarama "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	kafkatesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/testing"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
 )
 
 // Test Constants
diff --git a/pkg/common/kafka/producer/producer.go b/pkg/channel/distributed/common/kafka/producer/producer.go
similarity index 100%
rename from pkg/common/kafka/producer/producer.go
rename to pkg/channel/distributed/common/kafka/producer/producer.go
diff --git a/pkg/common/kafka/producer/producer_test.go b/pkg/channel/distributed/common/kafka/producer/producer_test.go
similarity index 91%
rename from pkg/common/kafka/producer/producer_test.go
rename to pkg/channel/distributed/common/kafka/producer/producer_test.go
index d209ce929..92f237035 100644
--- a/pkg/common/kafka/producer/producer_test.go
+++ b/pkg/channel/distributed/common/kafka/producer/producer_test.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/Shopify/sarama"
 	"github.com/stretchr/testify/assert"
-	"knative.dev/eventing-kafka/pkg/channel/test"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
-	kafkasarama "knative.dev/eventing-kafka/pkg/common/kafka/sarama"
-	commontesting "knative.dev/eventing-kafka/pkg/common/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
+	kafkasarama "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/sarama"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/test"
 )
 
 // Test Constants
diff --git a/pkg/common/kafka/sarama/sarama_test.go b/pkg/channel/distributed/common/kafka/sarama/sarama_test.go
similarity index 98%
rename from pkg/common/kafka/sarama/sarama_test.go
rename to pkg/channel/distributed/common/kafka/sarama/sarama_test.go
index 63cd3fb1e..59c22ce75 100644
--- a/pkg/common/kafka/sarama/sarama_test.go
+++ b/pkg/channel/distributed/common/kafka/sarama/sarama_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/client-go/kubernetes/fake"
-	commonconfig "knative.dev/eventing-kafka/pkg/common/config"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/constants"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
-	commontesting "knative.dev/eventing-kafka/pkg/common/testing"
+	commonconfig "knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
 	injectionclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/system"
 )
diff --git a/pkg/common/kafka/util/util_test.go b/pkg/channel/distributed/common/kafka/util/util_test.go
similarity index 94%
rename from pkg/common/kafka/util/util_test.go
rename to pkg/channel/distributed/common/kafka/util/util_test.go
index 394875a70..4d6adccdc 100644
--- a/pkg/common/kafka/util/util_test.go
+++ b/pkg/channel/distributed/common/kafka/util/util_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"knative.dev/eventing-kafka/pkg/common/kafka/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
 )
 
 // Test The TopicName() Functionality
diff --git a/pkg/common/metrics/README.md b/pkg/channel/distributed/common/metrics/README.md
similarity index 100%
rename from pkg/common/metrics/README.md
rename to pkg/channel/distributed/common/metrics/README.md
diff --git a/pkg/common/metrics/stats_reporter.go b/pkg/channel/distributed/common/metrics/stats_reporter.go
similarity index 100%
rename from pkg/common/metrics/stats_reporter.go
rename to pkg/channel/distributed/common/metrics/stats_reporter.go
diff --git a/pkg/common/metrics/stats_reporter_test.go b/pkg/channel/distributed/common/metrics/stats_reporter_test.go
similarity index 96%
rename from pkg/common/metrics/stats_reporter_test.go
rename to pkg/channel/distributed/common/metrics/stats_reporter_test.go
index 6488d5b86..e79d9faa5 100644
--- a/pkg/common/metrics/stats_reporter_test.go
+++ b/pkg/channel/distributed/common/metrics/stats_reporter_test.go
@@ -15,10 +15,10 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/common/constants"
-	"knative.dev/eventing-kafka/pkg/common/env"
-	commontesting "knative.dev/eventing-kafka/pkg/common/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
 	injectionclient "knative.dev/pkg/client/injection/kube/client"
 	logtesting "knative.dev/pkg/logging/testing"
 	"knative.dev/pkg/metrics"
diff --git a/pkg/controller/config/config_test.go b/pkg/channel/distributed/controller/config/config_test.go
similarity index 99%
rename from pkg/controller/config/config_test.go
rename to pkg/channel/distributed/controller/config/config_test.go
index 1202ceb53..3b274c42f 100644
--- a/pkg/controller/config/config_test.go
+++ b/pkg/channel/distributed/controller/config/config_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"knative.dev/eventing-kafka/pkg/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
 )
 
 // Test Constants
diff --git a/pkg/controller/env/environment_test.go b/pkg/channel/distributed/controller/env/environment_test.go
similarity index 98%
rename from pkg/controller/env/environment_test.go
rename to pkg/channel/distributed/controller/env/environment_test.go
index 223cbacea..50b8b6415 100644
--- a/pkg/controller/env/environment_test.go
+++ b/pkg/channel/distributed/controller/env/environment_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
-	"knative.dev/eventing-kafka/pkg/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
 )
 
 // Test Constants
diff --git a/pkg/channel/distributed/controller/kafkachannel/controller_test.go b/pkg/channel/distributed/controller/kafkachannel/controller_test.go
new file mode 100644
index 000000000..7026b4353
--- /dev/null
+++ b/pkg/channel/distributed/controller/kafkachannel/controller_test.go
@@ -0,0 +1,83 @@
+package kafkachannel
+
+import (
+	"context"
+	"os"
+	"strconv"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"k8s.io/client-go/rest"
+	fakeKafkaClient "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client/fake"
+	_ "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel/fake" // Knative Fake Informer Injection
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	commonenv "knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
+	controllerenv "knative.dev/eventing-kafka/pkg/channel/distributed/controller/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/test"
+	controllertest "knative.dev/eventing-kafka/pkg/channel/distributed/controller/test"
+	"knative.dev/eventing/pkg/logging"
+	"knative.dev/pkg/client/injection/kube/client/fake"
+	_ "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake" // Knative Fake Informer Injection
+	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake"    // Knative Fake Informer Injection
+	"knative.dev/pkg/injection"
+	logtesting "knative.dev/pkg/logging/testing"
+	"knative.dev/pkg/system"
+)
+
+// Test The NewController() Functionality
+func TestNewController(t *testing.T) {
+
+	// Populate Environment Variables For Testing
+	populateEnvironmentVariables(t)
+
+	// Create A Context With Test Logger
+	ctx := logging.WithLogger(context.Background(), logtesting.TestLogger(t).Desugar())
+
+	// Register Fake Informers (See Injection "_" Imports Above!)
+	ctx, fakeInformers := injection.Fake.SetupInformers(ctx, &rest.Config{})
+	assert.NotNil(t, fakeInformers)
+
+	// Add The Fake K8S Clientset To The Context (Populated With ConfigMap)
+	configMap := commontesting.GetTestSaramaConfigMap(test.SaramaConfigYaml, test.ControllerConfigYaml)
+	ctx, fakeClientset := fake.With(ctx, configMap)
+	assert.NotNil(t, fakeClientset)
+
+	// Add The Fake Kafka Clientset To The Context (Empty)
+	ctx, fakeKafkaClientset := fakeKafkaClient.With(ctx)
+	assert.NotNil(t, fakeKafkaClientset)
+
+	// Perform The Test (Create The KafkaChannel Controller)
+	controller := NewController(ctx, nil)
+
+	// Verify The Results
+	assert.NotNil(t, controller)
+	assert.Equal(t, "knative.dev-eventing-kafka-pkg-channel-distributed-controller-kafkachannel.Reconciler", controller.Name)
+	assert.NotNil(t, controller.Reconciler)
+}
+
+// Test The Shutdown() Functionality
+func TestShutdown(t *testing.T) {
+
+	// Create A Mock AdminClient To Test Closing
+	mockAdminClient := &controllertest.MockAdminClient{}
+
+	// Set The Package Level The Reconciler To Test Against
+	rec = &Reconciler{adminClient: mockAdminClient}
+
+	// Perform The Test
+	Shutdown()
+
+	// Verify The Results
+	assert.True(t, mockAdminClient.CloseCalled())
+}
+
+// Utility Function For Populating Required Environment Variables For Testing
+func populateEnvironmentVariables(t *testing.T) {
+	assert.Nil(t, os.Setenv(system.NamespaceEnvKey, commonconstants.KnativeEventingNamespace))
+	assert.Nil(t, os.Setenv(commonenv.ServiceAccountEnvVarKey, test.ServiceAccount))
+	assert.Nil(t, os.Setenv(commonenv.MetricsDomainEnvVarKey, test.MetricsDomain))
+	assert.Nil(t, os.Setenv(commonenv.MetricsPortEnvVarKey, strconv.Itoa(test.MetricsPort)))
+	assert.Nil(t, os.Setenv(controllerenv.DispatcherImageEnvVarKey, test.MetricsDomain))
+	assert.Nil(t, os.Setenv(controllerenv.ChannelImageEnvVarKey, test.MetricsDomain))
+}
diff --git a/pkg/controller/kafkachannel/reconciler_test.go b/pkg/channel/distributed/controller/kafkachannel/reconciler_test.go
similarity index 98%
rename from pkg/controller/kafkachannel/reconciler_test.go
rename to pkg/channel/distributed/controller/kafkachannel/reconciler_test.go
index e975d1138..a9dbe74de 100644
--- a/pkg/controller/kafkachannel/reconciler_test.go
+++ b/pkg/channel/distributed/controller/kafkachannel/reconciler_test.go
@@ -14,9 +14,9 @@ import (
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
 	fakekafkaclient "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client/fake"
 	kafkachannelreconciler "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/reconciler/messaging/v1beta1/kafkachannel"
-	kafkaadmin "knative.dev/eventing-kafka/pkg/common/kafka/admin"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/test"
+	kafkaadmin "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/test"
 	"knative.dev/eventing/pkg/logging"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
diff --git a/pkg/controller/kafkachannel/topic_test.go b/pkg/channel/distributed/controller/kafkachannel/topic_test.go
similarity index 98%
rename from pkg/controller/kafkachannel/topic_test.go
rename to pkg/channel/distributed/controller/kafkachannel/topic_test.go
index a87f3b156..57fe179c9 100644
--- a/pkg/controller/kafkachannel/topic_test.go
+++ b/pkg/channel/distributed/controller/kafkachannel/topic_test.go
@@ -10,8 +10,8 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/test"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/test"
 	"knative.dev/pkg/controller"
 	logtesting "knative.dev/pkg/logging/testing"
 )
diff --git a/pkg/channel/distributed/controller/kafkasecret/controller_test.go b/pkg/channel/distributed/controller/kafkasecret/controller_test.go
new file mode 100644
index 000000000..2512e5188
--- /dev/null
+++ b/pkg/channel/distributed/controller/kafkasecret/controller_test.go
@@ -0,0 +1,72 @@
+package kafkasecret
+
+import (
+	"context"
+	"os"
+	"strconv"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"k8s.io/client-go/rest"
+	fakeKafkaClient "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client/fake"
+	_ "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/informers/messaging/v1beta1/kafkachannel/fake" // Knative Fake Informer Injection
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	commonenv "knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
+	commontesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/testing"
+	controllerenv "knative.dev/eventing-kafka/pkg/channel/distributed/controller/env"
+	_ "knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkasecretinformer/fake" // Knative Fake Informer Injection
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/test"
+	"knative.dev/eventing/pkg/logging"
+	"knative.dev/pkg/client/injection/kube/client/fake"
+	_ "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake" // Knative Fake Informer Injection
+	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake"    // Knative Fake Informer Injection
+	"knative.dev/pkg/injection"
+	logtesting "knative.dev/pkg/logging/testing"
+	"knative.dev/pkg/system"
+)
+
+// Test The NewController() Functionality
+func TestNewController(t *testing.T) {
+
+	// Populate Environment Variables For Testing
+	populateEnvironmentVariables(t)
+
+	// Create A Context With Test Logger
+	ctx := logging.WithLogger(context.Background(), logtesting.TestLogger(t).Desugar())
+
+	// Register Fake Informers (See Injection "_" Imports Above!)
+	ctx, fakeInformers := injection.Fake.SetupInformers(ctx, &rest.Config{})
+	assert.NotNil(t, fakeInformers)
+
+	// Add The Fake K8S Clientset To The Context (Populated With ConfigMap)
+	configMap := commontesting.GetTestSaramaConfigMap(test.SaramaConfigYaml, test.ControllerConfigYaml)
+	ctx, fakeClientset := fake.With(ctx, configMap)
+	assert.NotNil(t, fakeClientset)
+
+	// Add The Fake Kafka Clientset To The Context (Empty)
+	ctx, fakeKafkaClientset := fakeKafkaClient.With(ctx)
+	assert.NotNil(t, fakeKafkaClientset)
+
+	// Perform The Test (Create The KafkaChannel Controller)
+	controller := NewController(ctx, nil)
+
+	// Verify The Results
+	assert.NotNil(t, controller)
+	assert.Equal(t, "knative.dev-eventing-kafka-pkg-channel-distributed-controller-kafkasecret.Reconciler", controller.Name)
+	assert.NotNil(t, controller.Reconciler)
+}
+
+// Test The Shutdown() Functionality - No-op Test Just For Coverage ; )
+func TestShutdown(t *testing.T) {
+	Shutdown()
+}
+
+// Utility Function For Populating Required Environment Variables For Testing
+func populateEnvironmentVariables(t *testing.T) {
+	assert.Nil(t, os.Setenv(system.NamespaceEnvKey, commonconstants.KnativeEventingNamespace))
+	assert.Nil(t, os.Setenv(commonenv.ServiceAccountEnvVarKey, test.ServiceAccount))
+	assert.Nil(t, os.Setenv(commonenv.MetricsDomainEnvVarKey, test.MetricsDomain))
+	assert.Nil(t, os.Setenv(commonenv.MetricsPortEnvVarKey, strconv.Itoa(test.MetricsPort)))
+	assert.Nil(t, os.Setenv(controllerenv.DispatcherImageEnvVarKey, test.MetricsDomain))
+	assert.Nil(t, os.Setenv(controllerenv.ChannelImageEnvVarKey, test.MetricsDomain))
+}
diff --git a/pkg/controller/kafkasecret/reconciler_test.go b/pkg/channel/distributed/controller/kafkasecret/reconciler_test.go
similarity index 97%
rename from pkg/controller/kafkasecret/reconciler_test.go
rename to pkg/channel/distributed/controller/kafkasecret/reconciler_test.go
index 1ef2322ee..de81f4b10 100644
--- a/pkg/controller/kafkasecret/reconciler_test.go
+++ b/pkg/channel/distributed/controller/kafkasecret/reconciler_test.go
@@ -10,9 +10,9 @@ import (
 	clientgotesting "k8s.io/client-go/testing"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
 	fakekafkaclient "knative.dev/eventing-contrib/kafka/channel/pkg/client/injection/client/fake"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/kafkasecretinjection"
-	"knative.dev/eventing-kafka/pkg/controller/test"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/kafkasecretinjection"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/test"
 	"knative.dev/eventing/pkg/logging"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
diff --git a/pkg/controller/kafkasecretinjection/reconciler.go b/pkg/channel/distributed/controller/kafkasecretinjection/reconciler.go
similarity index 100%
rename from pkg/controller/kafkasecretinjection/reconciler.go
rename to pkg/channel/distributed/controller/kafkasecretinjection/reconciler.go
diff --git a/pkg/controller/kafkasecretinjection/state.go b/pkg/channel/distributed/controller/kafkasecretinjection/state.go
similarity index 100%
rename from pkg/controller/kafkasecretinjection/state.go
rename to pkg/channel/distributed/controller/kafkasecretinjection/state.go
diff --git a/pkg/controller/test/data.go b/pkg/channel/distributed/controller/test/data.go
similarity index 94%
rename from pkg/controller/test/data.go
rename to pkg/channel/distributed/controller/test/data.go
index b7131c584..d12cd7360 100644
--- a/pkg/controller/test/data.go
+++ b/pkg/channel/distributed/controller/test/data.go
@@ -13,16 +13,16 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	clientgotesting "k8s.io/client-go/testing"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/constants"
-	commonenv "knative.dev/eventing-kafka/pkg/common/env"
-	"knative.dev/eventing-kafka/pkg/common/health"
-	kafkaconstants "knative.dev/eventing-kafka/pkg/common/kafka/constants"
-	kafkautil "knative.dev/eventing-kafka/pkg/common/kafka/util"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
-	"knative.dev/eventing-kafka/pkg/controller/env"
-	"knative.dev/eventing-kafka/pkg/controller/event"
-	"knative.dev/eventing-kafka/pkg/controller/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	commonenv "knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/health"
+	kafkaconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/constants"
+	kafkautil "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/util"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/event"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/util"
 	"knative.dev/eventing/pkg/apis/messaging"
 	"knative.dev/pkg/apis"
 	"knative.dev/pkg/logging"
@@ -86,6 +86,54 @@ const (
 	ChannelMemoryLimit   = "20Mi"
 	ChannelCpuRequest    = "10m"
 	ChannelCpuLimit      = "100m"
+
+	ControllerConfigYaml = `
+channel:
+  cpuLimit: 200m
+  cpuRequest: 100m
+  memoryLimit: 100Mi
+  memoryRequest: 50Mi
+  replicas: 1
+dispatcher:
+  cpuLimit: 500m
+  cpuRequest: 300m
+  memoryLimit: 128Mi
+  memoryRequest: 50Mi
+  replicas: 1
+  retryInitialIntervalMillis: 500
+  retryTimeMillis: 300000
+  retryExponentialBackoff: true
+kafka:
+  topic:
+    defaultNumPartitions: 4
+    defaultReplicationFactor: 1
+    defaultRetentionMillis: 604800000
+  adminType: kafka
+`
+	SaramaConfigYaml = `
+Version: 2.0.0
+Admin:
+  Timeout: 10000000000  # 10 seconds
+Net:
+  KeepAlive: 30000000000  # 30 seconds
+  MaxOpenRequests: 1 # Set to 1 for use with Idempotent Producer
+  TLS:
+    Enable: false
+  SASL:
+    Enable: false
+    Mechanism: PLAIN
+    Version: 1
+Metadata:
+  RefreshFrequency: 300000000000
+Consumer:
+  Offsets:
+    AutoCommit:
+        Interval: 5000000000
+    Retention: 604800000000000
+Producer:
+  Idempotent: true
+  RequiredAcks: -1
+`
 )
 
 var (
diff --git a/pkg/controller/test/factory.go b/pkg/channel/distributed/controller/test/factory.go
similarity index 100%
rename from pkg/controller/test/factory.go
rename to pkg/channel/distributed/controller/test/factory.go
diff --git a/pkg/controller/test/lister.go b/pkg/channel/distributed/controller/test/lister.go
similarity index 100%
rename from pkg/controller/test/lister.go
rename to pkg/channel/distributed/controller/test/lister.go
diff --git a/pkg/controller/test/mock.go b/pkg/channel/distributed/controller/test/mock.go
similarity index 96%
rename from pkg/controller/test/mock.go
rename to pkg/channel/distributed/controller/test/mock.go
index b4b79db15..265000be4 100644
--- a/pkg/controller/test/mock.go
+++ b/pkg/channel/distributed/controller/test/mock.go
@@ -2,8 +2,9 @@ package test
 
 import (
 	"context"
+
 	"github.com/Shopify/sarama"
-	kafkaadmin "knative.dev/eventing-kafka/pkg/common/kafka/admin"
+	kafkaadmin "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/admin"
 )
 
 //
diff --git a/pkg/controller/util/channel_test.go b/pkg/channel/distributed/controller/util/channel_test.go
similarity index 97%
rename from pkg/controller/util/channel_test.go
rename to pkg/channel/distributed/controller/util/channel_test.go
index 305995f18..4727cdbca 100644
--- a/pkg/controller/util/channel_test.go
+++ b/pkg/channel/distributed/controller/util/channel_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kafkav1beta1 "knative.dev/eventing-contrib/kafka/channel/pkg/apis/messaging/v1beta1"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 	logtesting "knative.dev/pkg/logging/testing"
 )
 
diff --git a/pkg/controller/util/finalizer_test.go b/pkg/channel/distributed/controller/util/finalizer_test.go
similarity index 81%
rename from pkg/controller/util/finalizer_test.go
rename to pkg/channel/distributed/controller/util/finalizer_test.go
index 8dd3e2b4b..1b56b8cb0 100644
--- a/pkg/controller/util/finalizer_test.go
+++ b/pkg/channel/distributed/controller/util/finalizer_test.go
@@ -1,9 +1,10 @@
 package util
 
 import (
-	"github.com/stretchr/testify/assert"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 )
 
 // Test The KubernetesResourceFinalizerName() Functionality
diff --git a/pkg/controller/util/secret_test.go b/pkg/channel/distributed/controller/util/secret_test.go
similarity index 94%
rename from pkg/controller/util/secret_test.go
rename to pkg/channel/distributed/controller/util/secret_test.go
index d0d29d925..ef86775a7 100644
--- a/pkg/controller/util/secret_test.go
+++ b/pkg/channel/distributed/controller/util/secret_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 	logtesting "knative.dev/pkg/logging/testing"
 	"testing"
 )
diff --git a/pkg/controller/util/subscription_test.go b/pkg/channel/distributed/controller/util/subscription_test.go
similarity index 94%
rename from pkg/controller/util/subscription_test.go
rename to pkg/channel/distributed/controller/util/subscription_test.go
index 947fc6f7d..204a4aabd 100644
--- a/pkg/controller/util/subscription_test.go
+++ b/pkg/channel/distributed/controller/util/subscription_test.go
@@ -1,12 +1,13 @@
 package util
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"knative.dev/eventing-kafka/pkg/controller/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/controller/constants"
 	messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
 	logtesting "knative.dev/pkg/logging/testing"
-	"testing"
 )
 
 // Test The SubscriptionLogger Functionality
diff --git a/pkg/dispatcher/config/config_test.go b/pkg/channel/distributed/dispatcher/config/config_test.go
similarity index 95%
rename from pkg/dispatcher/config/config_test.go
rename to pkg/channel/distributed/dispatcher/config/config_test.go
index bbed663e4..7e647dccb 100644
--- a/pkg/dispatcher/config/config_test.go
+++ b/pkg/channel/distributed/dispatcher/config/config_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/dispatcher/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/constants"
 )
 
 // Test Constants
diff --git a/pkg/dispatcher/controller/kafkachannel_test.go b/pkg/channel/distributed/dispatcher/controller/kafkachannel_test.go
similarity index 93%
rename from pkg/dispatcher/controller/kafkachannel_test.go
rename to pkg/channel/distributed/dispatcher/controller/kafkachannel_test.go
index 55464bd96..de21e4e18 100644
--- a/pkg/dispatcher/controller/kafkachannel_test.go
+++ b/pkg/channel/distributed/dispatcher/controller/kafkachannel_test.go
@@ -15,9 +15,8 @@ import (
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned"
 	fakeclientset "knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned/fake"
 	"knative.dev/eventing-contrib/kafka/channel/pkg/client/informers/externalversions"
-	"knative.dev/eventing-kafka/pkg/dispatcher/dispatcher"
-	dispatchertesting "knative.dev/eventing-kafka/pkg/dispatcher/testing"
-	reconciletesting "knative.dev/eventing-kafka/pkg/dispatcher/testing"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/dispatcher"
+	reconciletesting "knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/testing"
 	eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
 	"knative.dev/pkg/controller"
 	kncontroller "knative.dev/pkg/controller"
@@ -142,7 +141,7 @@ func TestAllCases(t *testing.T) {
 		},
 	}
 
-	table.Test(t, reconciletesting.MakeFactory(func(listers *dispatchertesting.Listers, kafkaClient versioned.Interface, eventRecorder record.EventRecorder) controller.Reconciler {
+	table.Test(t, reconciletesting.MakeFactory(func(listers *reconciletesting.Listers, kafkaClient versioned.Interface, eventRecorder record.EventRecorder) controller.Reconciler {
 		return &Reconciler{
 			logger:               logtesting.TestLogger(t).Desugar(),
 			channelKey:           kcKey,
diff --git a/pkg/dispatcher/dispatcher/dispatcher_test.go b/pkg/channel/distributed/dispatcher/dispatcher/dispatcher_test.go
similarity index 97%
rename from pkg/dispatcher/dispatcher/dispatcher_test.go
rename to pkg/channel/distributed/dispatcher/dispatcher/dispatcher_test.go
index 0b29f4241..fb59aa201 100644
--- a/pkg/dispatcher/dispatcher/dispatcher_test.go
+++ b/pkg/channel/distributed/dispatcher/dispatcher/dispatcher_test.go
@@ -11,10 +11,10 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	commonconfig "knative.dev/eventing-kafka/pkg/common/config"
-	"knative.dev/eventing-kafka/pkg/common/constants"
-	kafkaconsumer "knative.dev/eventing-kafka/pkg/common/kafka/consumer"
-	kafkatesting "knative.dev/eventing-kafka/pkg/common/kafka/testing"
+	commonconfig "knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	kafkaconsumer "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/consumer"
+	kafkatesting "knative.dev/eventing-kafka/pkg/channel/distributed/common/kafka/testing"
 	eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
 	"knative.dev/eventing/pkg/channel"
 	logtesting "knative.dev/pkg/logging/testing"
diff --git a/pkg/dispatcher/dispatcher/handler.go b/pkg/channel/distributed/dispatcher/dispatcher/handler.go
similarity index 100%
rename from pkg/dispatcher/dispatcher/handler.go
rename to pkg/channel/distributed/dispatcher/dispatcher/handler.go
diff --git a/pkg/dispatcher/dispatcher/handler_test.go b/pkg/channel/distributed/dispatcher/dispatcher/handler_test.go
similarity index 99%
rename from pkg/dispatcher/dispatcher/handler_test.go
rename to pkg/channel/distributed/dispatcher/dispatcher/handler_test.go
index 3d4316af7..29b7c300c 100644
--- a/pkg/dispatcher/dispatcher/handler_test.go
+++ b/pkg/channel/distributed/dispatcher/dispatcher/handler_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"k8s.io/apimachinery/pkg/types"
-	dispatchertesting "knative.dev/eventing-kafka/pkg/dispatcher/testing"
+	dispatchertesting "knative.dev/eventing-kafka/pkg/channel/distributed/dispatcher/testing"
 	eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
 	"knative.dev/eventing/pkg/channel"
 	"knative.dev/pkg/apis"
diff --git a/pkg/dispatcher/env/environment_test.go b/pkg/channel/distributed/dispatcher/env/environment_test.go
similarity index 98%
rename from pkg/dispatcher/env/environment_test.go
rename to pkg/channel/distributed/dispatcher/env/environment_test.go
index bcc03fb57..245b494ed 100644
--- a/pkg/dispatcher/env/environment_test.go
+++ b/pkg/channel/distributed/dispatcher/env/environment_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
-	commonenv "knative.dev/eventing-kafka/pkg/common/env"
+	commonenv "knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
 )
 
 // Test Constants
diff --git a/pkg/channel/channel/channel_test.go b/pkg/channel/distributed/receiver/channel/channel_test.go
similarity index 93%
rename from pkg/channel/channel/channel_test.go
rename to pkg/channel/distributed/receiver/channel/channel_test.go
index 46dd0ffc7..1f94a2cad 100644
--- a/pkg/channel/channel/channel_test.go
+++ b/pkg/channel/distributed/receiver/channel/channel_test.go
@@ -6,8 +6,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	kafkaclientset "knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned"
 	fakeclientset "knative.dev/eventing-contrib/kafka/channel/pkg/client/clientset/versioned/fake"
-	channelhealth "knative.dev/eventing-kafka/pkg/channel/health"
-	"knative.dev/eventing-kafka/pkg/channel/test"
+	channelhealth "knative.dev/eventing-kafka/pkg/channel/distributed/receiver/health"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/test"
 	"knative.dev/pkg/logging"
 	logtesting "knative.dev/pkg/logging/testing"
 	"testing"
@@ -17,7 +17,7 @@ import (
 func TestInitializeKafkaChannelLister(t *testing.T) {
 
 	// Stub The K8S Client Creation Wrapper With Test Version Returning The Fake KafkaClient Clientset
-	getKafkaClient = func(ctx context.Context, masterUrl string, kubeconfigPath string) (kafkaclientset.Interface, error) {
+	getKafkaClient = func(ctx context.Context, serverUrl string, kubeconfigPath string) (kafkaclientset.Interface, error) {
 		return fakeclientset.NewSimpleClientset(), nil
 	}
 
diff --git a/pkg/channel/env/environment_test.go b/pkg/channel/distributed/receiver/env/environment_test.go
similarity index 98%
rename from pkg/channel/env/environment_test.go
rename to pkg/channel/distributed/receiver/env/environment_test.go
index df2eea911..d76a54d05 100644
--- a/pkg/channel/env/environment_test.go
+++ b/pkg/channel/distributed/receiver/env/environment_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
-	"knative.dev/eventing-kafka/pkg/common/env"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/env"
 )
 
 // Test Constants
diff --git a/pkg/channel/producer/producer_test.go b/pkg/channel/distributed/receiver/producer/producer_test.go
similarity index 95%
rename from pkg/channel/producer/producer_test.go
rename to pkg/channel/distributed/receiver/producer/producer_test.go
index c4c9d3455..0543afba7 100644
--- a/pkg/channel/producer/producer_test.go
+++ b/pkg/channel/distributed/receiver/producer/producer_test.go
@@ -12,12 +12,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"knative.dev/eventing-kafka/pkg/channel/constants"
-	channelhealth "knative.dev/eventing-kafka/pkg/channel/health"
-	"knative.dev/eventing-kafka/pkg/channel/test"
-	commonconfig "knative.dev/eventing-kafka/pkg/common/config"
-	commonconstants "knative.dev/eventing-kafka/pkg/common/constants"
-	"knative.dev/eventing-kafka/pkg/common/metrics"
+	commonconfig "knative.dev/eventing-kafka/pkg/channel/distributed/common/config"
+	commonconstants "knative.dev/eventing-kafka/pkg/channel/distributed/common/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/common/metrics"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/constants"
+	channelhealth "knative.dev/eventing-kafka/pkg/channel/distributed/receiver/health"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/test"
 	logtesting "knative.dev/pkg/logging/testing"
 	"knative.dev/pkg/system"
 
diff --git a/pkg/channel/test/channel.go b/pkg/channel/distributed/receiver/test/channel.go
similarity index 100%
rename from pkg/channel/test/channel.go
rename to pkg/channel/distributed/receiver/test/channel.go
diff --git a/pkg/channel/test/constants.go b/pkg/channel/distributed/receiver/test/constants.go
similarity index 100%
rename from pkg/channel/test/constants.go
rename to pkg/channel/distributed/receiver/test/constants.go
diff --git a/pkg/channel/test/event.go b/pkg/channel/distributed/receiver/test/event.go
similarity index 90%
rename from pkg/channel/test/event.go
rename to pkg/channel/distributed/receiver/test/event.go
index 798af78b1..95a20e6b0 100644
--- a/pkg/channel/test/event.go
+++ b/pkg/channel/distributed/receiver/test/event.go
@@ -2,8 +2,9 @@ package test
 
 import (
 	"encoding/json"
+
 	"github.com/cloudevents/sdk-go/v2/event"
-	"knative.dev/eventing-kafka/pkg/channel/constants"
+	"knative.dev/eventing-kafka/pkg/channel/distributed/receiver/constants"
 )
 
 // Test Data