diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/EncodedRSAPublicKeyToBase64.java b/apis/ec2/src/main/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64.java
similarity index 98%
rename from providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/EncodedRSAPublicKeyToBase64.java
rename to apis/ec2/src/main/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64.java
index de9d32374c..0d877d6343 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/EncodedRSAPublicKeyToBase64.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.aws.ec2.functions;
+package org.jclouds.ec2.functions;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/functions/EncodedRSAPublicKeyToBase64Test.java b/apis/ec2/src/test/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64Test.java
similarity index 97%
rename from providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/functions/EncodedRSAPublicKeyToBase64Test.java
rename to apis/ec2/src/test/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64Test.java
index fa4616a0e9..05ba97ab45 100644
--- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/functions/EncodedRSAPublicKeyToBase64Test.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/functions/EncodedRSAPublicKeyToBase64Test.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.aws.ec2.functions;
+package org.jclouds.ec2.functions;
 
 import static org.testng.Assert.assertEquals;
 
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java
index cec98084a3..98b6ff4705 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java
@@ -24,11 +24,10 @@ import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 
-import org.jclouds.aws.ec2.functions.EncodedRSAPublicKeyToBase64;
 import org.jclouds.aws.filters.FormSigner;
 import org.jclouds.ec2.domain.KeyPair;
+import org.jclouds.ec2.functions.EncodedRSAPublicKeyToBase64;
 import org.jclouds.ec2.services.KeyPairAsyncClient;
-import org.jclouds.ec2.services.KeyPairClient;
 import org.jclouds.ec2.xml.KeyPairResponseHandler;
 import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
@@ -49,7 +48,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 public interface AWSKeyPairAsyncClient extends KeyPairAsyncClient {
 
    /**
-    * @see KeyPairClient#importKeyPairInRegion
+    * @see AWSKeyPairClient#importKeyPairInRegion
     */
    @POST
    @Path("/")