diff --git a/aether-connector-wagon/src/main/java/org/eclipse/aether/connector/wagon/PlexusWagonConfigurator.java b/aether-connector-wagon/src/main/java/org/eclipse/aether/internal/connector/wagon/PlexusWagonConfigurator.java
similarity index 95%
rename from aether-connector-wagon/src/main/java/org/eclipse/aether/connector/wagon/PlexusWagonConfigurator.java
rename to aether-connector-wagon/src/main/java/org/eclipse/aether/internal/connector/wagon/PlexusWagonConfigurator.java
index da321ce1e66fb46f5d24e542a05737e91a2ae48d..fccc51e80aa79e894fdbd451feef8e3956f77e9c 100644
--- a/aether-connector-wagon/src/main/java/org/eclipse/aether/connector/wagon/PlexusWagonConfigurator.java
+++ b/aether-connector-wagon/src/main/java/org/eclipse/aether/internal/connector/wagon/PlexusWagonConfigurator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 Sonatype, Inc.
+ * Copyright (c) 2010, 2012 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *    Sonatype, Inc. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.aether.connector.wagon;
+package org.eclipse.aether.internal.connector.wagon;
 
 import org.apache.maven.wagon.Wagon;
 import org.codehaus.plexus.PlexusContainer;
@@ -23,6 +23,7 @@ import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.eclipse.aether.connector.wagon.WagonConfigurator;
 
 /**
  * A wagon configurator based on the Plexus component configuration framework.
diff --git a/aether-connector-wagon/src/main/java/org/eclipse/aether/connector/wagon/PlexusWagonProvider.java b/aether-connector-wagon/src/main/java/org/eclipse/aether/internal/connector/wagon/PlexusWagonProvider.java
similarity index 89%
rename from aether-connector-wagon/src/main/java/org/eclipse/aether/connector/wagon/PlexusWagonProvider.java
rename to aether-connector-wagon/src/main/java/org/eclipse/aether/internal/connector/wagon/PlexusWagonProvider.java
index 444028c0df19b36a24e7f576fa5fb8e98edfb4b3..d750828f50803f5594b5082bbe4fdf3cc5a7beae 100644
--- a/aether-connector-wagon/src/main/java/org/eclipse/aether/connector/wagon/PlexusWagonProvider.java
+++ b/aether-connector-wagon/src/main/java/org/eclipse/aether/internal/connector/wagon/PlexusWagonProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 Sonatype, Inc.
+ * Copyright (c) 2010, 2012 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,12 +8,13 @@
  * Contributors:
  *    Sonatype, Inc. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.aether.connector.wagon;
+package org.eclipse.aether.internal.connector.wagon;
 
 import org.apache.maven.wagon.Wagon;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.eclipse.aether.connector.wagon.WagonProvider;
 
 /**
  * A wagon provider backed by a Plexus container and the wagons registered with this container.