Revert code cleanup for now (#428)

* Revert "Code cleanup in and around connector (#427)"

This reverts commit b3e88db48c.

* Revert "Refactored server setup and run out of main (#425)"

This reverts commit 05c57c3b85.

* Revert "Code cleanup of routes config loader and API server (#424)"

This reverts commit 1ee3eb4de3.

server/connector_test.go

@@ -61,9 +61,7 @@ func TestTrustedProxyNetworkPolicy(t *testing.T) {
 
 			policy := c.createProxyProtoPolicy()
 			upstreamAddr := &net.TCPAddr{IP: net.ParseIP(test.upstreamIP)}
-			policyResult, _ := policy(proxyproto.ConnPolicyOptions{
-				Upstream: upstreamAddr,
-			})
+			policyResult, _ := policy(upstreamAddr)
 			assert.Equal(t, test.expectedPolicy, policyResult, "Unexpected policy result for %s", test.name)
 		})
 	}