diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/AbstractMethodInterceptor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/AbstractMethodInterceptor.java
similarity index 91%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/ext/AbstractMethodInterceptor.java
rename to org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/AbstractMethodInterceptor.java
index 698c5b8545799e8790b9e6ce684eb3dae0d1f9fb..cde89a4aef5cd90d4c089e3d4e08faea2580df90 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/AbstractMethodInterceptor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/AbstractMethodInterceptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.ext;
+package org.springframework.config.java.internal.enhancement;
 
 import java.lang.reflect.Method;
 
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
  * 
  * @author Chris Beams
  */
-public abstract class AbstractMethodInterceptor implements BeanFactoryAware, MethodInterceptor {
+abstract class AbstractMethodInterceptor implements BeanFactoryAware, MethodInterceptor {
 	protected final Log log = LogFactory.getLog(this.getClass());
 	protected DefaultListableBeanFactory beanFactory;
 
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanMethodInterceptor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java
similarity index 94%
rename from org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanMethodInterceptor.java
rename to org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java
index d8f1829670f7122af74ff768a16c1c7ed0a7c703..0fce6cb2d4bb3dcbd398d33a516f60f6b7753e82 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanMethodInterceptor.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.ext;
+package org.springframework.config.java.internal.enhancement;
 
 import static java.lang.String.*;
 
@@ -22,6 +22,8 @@ import java.lang.reflect.Method;
 import net.sf.cglib.proxy.MethodProxy;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.config.java.ext.Bean;
+import org.springframework.config.java.ext.BeanRegistrar;
 
 
 /**
diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java
index e74e4d3e2bd73a874235dc0f5776feae53c1632b..769e384da9d6e06a6e689132120a76d1403b121d 100644
--- a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java
+++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java
@@ -42,7 +42,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.config.java.BeanDefinitionRegistrar;
 import org.springframework.config.java.BeanMethod;
 import org.springframework.config.java.Configuration;
-import org.springframework.config.java.ext.BeanMethodInterceptor;
 import org.springframework.config.java.ext.BeanRegistrar;