diff --git a/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java b/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
index e7c3302b..b6ae491e 100644
--- a/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
+++ b/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
@@ -39,25 +39,21 @@ import org.springframework.core.annotation.Order;
  */
 @Configuration
 @ConditionalOnClass(HealthIndicator.class)
+@ConditionalOnBean(DiscoveryClient.class)
+@ConditionalOnProperty(value = "spring.cloud.discovery.enabled", matchIfMissing = true)
 @Order(0)
 public class CommonsClientAutoConfiguration {
 
-	@Configuration
-	@ConditionalOnBean(DiscoveryClient.class)
-	@ConditionalOnProperty(value = "spring.cloud.discovery.enabled", matchIfMissing = true)
-	protected static class HealthConfiguration {
-
-		@Bean
-		public DiscoveryClientHealthIndicator instancesHealthIndicator(
-				DiscoveryClient discoveryClient) {
-			return new DiscoveryClientHealthIndicator(discoveryClient);
-		}
-
-		@Bean
-		public DiscoveryCompositeHealthIndicator discoveryHealthIndicator(
-				HealthAggregator aggregator, List<DiscoveryHealthIndicator> indicators) {
-			return new DiscoveryCompositeHealthIndicator(aggregator, indicators);
-		}
-
+	@Bean
+	public DiscoveryClientHealthIndicator instancesHealthIndicator(
+			DiscoveryClient discoveryClient) {
+		return new DiscoveryClientHealthIndicator(discoveryClient);
 	}
+
+	@Bean
+	public DiscoveryCompositeHealthIndicator discoveryHealthIndicator(
+			HealthAggregator aggregator, List<DiscoveryHealthIndicator> indicators) {
+		return new DiscoveryCompositeHealthIndicator(aggregator, indicators);
+	}
+
 }
diff --git a/src/main/java/org/springframework/cloud/client/ServiceInstance.java b/src/main/java/org/springframework/cloud/client/ServiceInstance.java
index 80877212..2fad76fe 100644
--- a/src/main/java/org/springframework/cloud/client/ServiceInstance.java
+++ b/src/main/java/org/springframework/cloud/client/ServiceInstance.java
@@ -21,8 +21,6 @@ package org.springframework.cloud.client;
  */
 public interface ServiceInstance {
 
-	// TODO: name? Server? HostAndPort? Instance?
-
 	public String getServiceId();
 
 	public String getHost();
diff --git a/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java b/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java
index 06b76a5b..698fb51c 100644
--- a/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java
+++ b/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java
@@ -17,7 +17,7 @@
 package org.springframework.cloud.client.circuitbreaker;
 
 import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.cloud.client.SingleImplementationImportSelector;
+import org.springframework.cloud.util.SingleImplementationImportSelector;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
diff --git a/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java b/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java
index e23e96ef..e57b70ad 100644
--- a/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java
+++ b/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java
@@ -17,7 +17,7 @@
 package org.springframework.cloud.client.discovery;
 
 import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.cloud.client.SingleImplementationImportSelector;
+import org.springframework.cloud.util.SingleImplementationImportSelector;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
diff --git a/src/main/java/org/springframework/cloud/client/SingleImplementationImportSelector.java b/src/main/java/org/springframework/cloud/util/SingleImplementationImportSelector.java
similarity index 98%
rename from src/main/java/org/springframework/cloud/client/SingleImplementationImportSelector.java
rename to src/main/java/org/springframework/cloud/util/SingleImplementationImportSelector.java
index 132ea6d3..84e8fdd2 100644
--- a/src/main/java/org/springframework/cloud/client/SingleImplementationImportSelector.java
+++ b/src/main/java/org/springframework/cloud/util/SingleImplementationImportSelector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.client;
+package org.springframework.cloud.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories
index 68039cde..9d369afe 100644
--- a/src/main/resources/META-INF/spring.factories
+++ b/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,4 @@
-# Bootstrap Configuration
+# AutoConfiguration
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.client.CommonsClientAutoConfiguration,\
 org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration
diff --git a/src/test/java/org/springframework/cloud/client/SingleImplementationImportSelectorTests.java b/src/test/java/org/springframework/cloud/util/SingleImplementationImportSelectorTests.java
similarity index 91%
rename from src/test/java/org/springframework/cloud/client/SingleImplementationImportSelectorTests.java
rename to src/test/java/org/springframework/cloud/util/SingleImplementationImportSelectorTests.java
index 0a616491..97f84b7f 100644
--- a/src/test/java/org/springframework/cloud/client/SingleImplementationImportSelectorTests.java
+++ b/src/test/java/org/springframework/cloud/util/SingleImplementationImportSelectorTests.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.client;
+package org.springframework.cloud.util;
 
 import org.junit.Test;
+import org.springframework.cloud.util.SingleImplementationImportSelector;
 
 import static org.junit.Assert.assertEquals;