diff --git a/Makefile b/Makefile
index 83ccc1e62fd..d3a30913c20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-LINTIGNOREDOT='awstesting/integration.+should not use dot imports'
+LINTIGNOREDOT='internal/awstesting/integration.+should not use dot imports'
 LINTIGNOREDOC='service/[^/]+/(api|service|waiters)\.go:.+(comment on exported|should have comment or be unexported)'
 LINTIGNORECONST='service/[^/]+/(api|service|waiters)\.go:.+(type|struct field|const|func) ([^ ]+) should be ([^ ]+)'
 LINTIGNORESTUTTER='service/[^/]+/(api|service)\.go:.+(and that stutters)'
@@ -63,56 +63,56 @@ unit-with-race-cover: get-deps-tests build verify
 integration: get-deps-tests integ-custom smoke-tests performance
 
 integ-custom:
-	go test -tags "integration" ./awstesting/integration/customizations/...
+	go test -tags "integration" ./internal/awstesting/integration/customizations/...
 
 cleanup-integ:
-	go run -tags "integration" ./awstesting/cmd/bucket_cleanup/main.go "aws-sdk-go-integration"
+	go run -tags "integration" ./internal/awstesting/cmd/bucket_cleanup/main.go "aws-sdk-go-integration"
 
 smoke-tests: get-deps-tests
-	gucumber -go-tags "integration" ./awstesting/integration/smoke
+	gucumber -go-tags "integration" ./internal/awstesting/integration/smoke
 
 performance: get-deps-tests
-	AWS_TESTING_LOG_RESULTS=${log-detailed} AWS_TESTING_REGION=$(region) AWS_TESTING_DB_TABLE=$(table) gucumber -go-tags "integration" ./awstesting/performance
+	AWS_TESTING_LOG_RESULTS=${log-detailed} AWS_TESTING_REGION=$(region) AWS_TESTING_DB_TABLE=$(table) gucumber -go-tags "integration" ./internal/awstesting/performance
 
 sandbox-tests: sandbox-test-go15 sandbox-test-go15-novendorexp sandbox-test-go16 sandbox-test-go17 sandbox-test-go18 sandbox-test-go19 sandbox-test-gotip
 
 sandbox-build-go15:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5 -t "aws-sdk-go-1.5" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.5 -t "aws-sdk-go-1.5" .
 sandbox-go15: sandbox-build-go15
 	docker run -i -t aws-sdk-go-1.5 bash
 sandbox-test-go15: sandbox-build-go15
 	docker run -t aws-sdk-go-1.5
 
 sandbox-build-go15-novendorexp:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5-novendorexp -t "aws-sdk-go-1.5-novendorexp" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.5-novendorexp -t "aws-sdk-go-1.5-novendorexp" .
 sandbox-go15-novendorexp: sandbox-build-go15-novendorexp
 	docker run -i -t aws-sdk-go-1.5-novendorexp bash
 sandbox-test-go15-novendorexp: sandbox-build-go15-novendorexp
 	docker run -t aws-sdk-go-1.5-novendorexp
 
 sandbox-build-go16:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.6 -t "aws-sdk-go-1.6" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.6 -t "aws-sdk-go-1.6" .
 sandbox-go16: sandbox-build-go16
 	docker run -i -t aws-sdk-go-1.6 bash
 sandbox-test-go16: sandbox-build-go16
 	docker run -t aws-sdk-go-1.6
 
 sandbox-build-go17:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.7 -t "aws-sdk-go-1.7" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.7 -t "aws-sdk-go-1.7" .
 sandbox-go17: sandbox-build-go17
 	docker run -i -t aws-sdk-go-1.7 bash
 sandbox-test-go17: sandbox-build-go17
 	docker run -t aws-sdk-go-1.7
 
 sandbox-build-go18:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.8" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.8" .
 sandbox-go18: sandbox-build-go18
 	docker run -i -t aws-sdk-go-1.8 bash
 sandbox-test-go18: sandbox-build-go18
 	docker run -t aws-sdk-go-1.8
 
 sandbox-build-go19:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.9" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.9" .
 sandbox-go19: sandbox-build-go19
 	docker run -i -t aws-sdk-go-1.9 bash
 sandbox-test-go19: sandbox-build-go19
@@ -120,14 +120,14 @@ sandbox-test-go19: sandbox-build-go19
 
 sandbox-build-gotip:
 	@echo "Run make update-aws-golang-tip, if this test fails because missing aws-golang:tip container"
-	docker build -f ./awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-tip" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-tip" .
 sandbox-gotip: sandbox-build-gotip
 	docker run -i -t aws-sdk-go-tip bash
 sandbox-test-gotip: sandbox-build-gotip
 	docker run -t aws-sdk-go-tip
 
 update-aws-golang-tip:
-	docker build --no-cache=true -f ./awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .
+	docker build --no-cache=true -f ./internal/awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .
 
 verify: get-deps-verify lint vet
 
@@ -147,7 +147,7 @@ else
 	GO_VET_CMD=go tool vet --all -shadow
 endif
 
-vet:
+vetinternal/:
 	${GO_VET_CMD} ${SDK_BASE_FOLDERS}
 
 get-deps: get-deps-tests get-deps-verify
diff --git a/awstesting/assert.go b/internal/awstesting/assert.go
similarity index 100%
rename from awstesting/assert.go
rename to internal/awstesting/assert.go
diff --git a/awstesting/assert_test.go b/internal/awstesting/assert_test.go
similarity index 100%
rename from awstesting/assert_test.go
rename to internal/awstesting/assert_test.go
diff --git a/awstesting/client.go b/internal/awstesting/client.go
similarity index 100%
rename from awstesting/client.go
rename to internal/awstesting/client.go
diff --git a/awstesting/cmd/bucket_cleanup/main.go b/internal/awstesting/cmd/bucket_cleanup/main.go
similarity index 100%
rename from awstesting/cmd/bucket_cleanup/main.go
rename to internal/awstesting/cmd/bucket_cleanup/main.go
diff --git a/awstesting/custom_ca_bundle.go b/internal/awstesting/custom_ca_bundle.go
similarity index 100%
rename from awstesting/custom_ca_bundle.go
rename to internal/awstesting/custom_ca_bundle.go
diff --git a/awstesting/integration/customizations/s3/integration_test.go b/internal/awstesting/integration/customizations/s3/integration_test.go
similarity index 100%
rename from awstesting/integration/customizations/s3/integration_test.go
rename to internal/awstesting/integration/customizations/s3/integration_test.go
diff --git a/awstesting/integration/customizations/s3/s3crypto/client.go b/internal/awstesting/integration/customizations/s3/s3crypto/client.go
similarity index 100%
rename from awstesting/integration/customizations/s3/s3crypto/client.go
rename to internal/awstesting/integration/customizations/s3/s3crypto/client.go
diff --git a/awstesting/integration/customizations/s3/s3crypto/s3_crypto.feature b/internal/awstesting/integration/customizations/s3/s3crypto/s3_crypto.feature
similarity index 100%
rename from awstesting/integration/customizations/s3/s3crypto/s3_crypto.feature
rename to internal/awstesting/integration/customizations/s3/s3crypto/s3_crypto.feature
diff --git a/awstesting/integration/customizations/s3/s3crypto/stepdef.go b/internal/awstesting/integration/customizations/s3/s3crypto/stepdef.go
similarity index 100%
rename from awstesting/integration/customizations/s3/s3crypto/stepdef.go
rename to internal/awstesting/integration/customizations/s3/s3crypto/stepdef.go
diff --git a/awstesting/integration/customizations/s3/s3manager/bucket_region_test.go b/internal/awstesting/integration/customizations/s3/s3manager/bucket_region_test.go
similarity index 100%
rename from awstesting/integration/customizations/s3/s3manager/bucket_region_test.go
rename to internal/awstesting/integration/customizations/s3/s3manager/bucket_region_test.go
diff --git a/awstesting/integration/customizations/s3/s3manager/integration_test.go b/internal/awstesting/integration/customizations/s3/s3manager/integration_test.go
similarity index 100%
rename from awstesting/integration/customizations/s3/s3manager/integration_test.go
rename to internal/awstesting/integration/customizations/s3/s3manager/integration_test.go
diff --git a/awstesting/integration/customizations/s3/s3manager/stub.go b/internal/awstesting/integration/customizations/s3/s3manager/stub.go
similarity index 100%
rename from awstesting/integration/customizations/s3/s3manager/stub.go
rename to internal/awstesting/integration/customizations/s3/s3manager/stub.go
diff --git a/awstesting/integration/customizations/s3/stub.go b/internal/awstesting/integration/customizations/s3/stub.go
similarity index 100%
rename from awstesting/integration/customizations/s3/stub.go
rename to internal/awstesting/integration/customizations/s3/stub.go
diff --git a/awstesting/integration/integration.go b/internal/awstesting/integration/integration.go
similarity index 100%
rename from awstesting/integration/integration.go
rename to internal/awstesting/integration/integration.go
diff --git a/awstesting/integration/smoke/acm/acm.feature b/internal/awstesting/integration/smoke/acm/acm.feature
similarity index 100%
rename from awstesting/integration/smoke/acm/acm.feature
rename to internal/awstesting/integration/smoke/acm/acm.feature
diff --git a/awstesting/integration/smoke/acm/client.go b/internal/awstesting/integration/smoke/acm/client.go
similarity index 100%
rename from awstesting/integration/smoke/acm/client.go
rename to internal/awstesting/integration/smoke/acm/client.go
diff --git a/awstesting/integration/smoke/apigateway/apigateway.feature b/internal/awstesting/integration/smoke/apigateway/apigateway.feature
similarity index 100%
rename from awstesting/integration/smoke/apigateway/apigateway.feature
rename to internal/awstesting/integration/smoke/apigateway/apigateway.feature
diff --git a/awstesting/integration/smoke/apigateway/client.go b/internal/awstesting/integration/smoke/apigateway/client.go
similarity index 100%
rename from awstesting/integration/smoke/apigateway/client.go
rename to internal/awstesting/integration/smoke/apigateway/client.go
diff --git a/awstesting/integration/smoke/applicationdiscoveryservice/applicationdiscoveryservice.feature b/internal/awstesting/integration/smoke/applicationdiscoveryservice/applicationdiscoveryservice.feature
similarity index 100%
rename from awstesting/integration/smoke/applicationdiscoveryservice/applicationdiscoveryservice.feature
rename to internal/awstesting/integration/smoke/applicationdiscoveryservice/applicationdiscoveryservice.feature
diff --git a/awstesting/integration/smoke/applicationdiscoveryservice/client.go b/internal/awstesting/integration/smoke/applicationdiscoveryservice/client.go
similarity index 100%
rename from awstesting/integration/smoke/applicationdiscoveryservice/client.go
rename to internal/awstesting/integration/smoke/applicationdiscoveryservice/client.go
diff --git a/awstesting/integration/smoke/autoscaling/autoscaling.feature b/internal/awstesting/integration/smoke/autoscaling/autoscaling.feature
similarity index 100%
rename from awstesting/integration/smoke/autoscaling/autoscaling.feature
rename to internal/awstesting/integration/smoke/autoscaling/autoscaling.feature
diff --git a/awstesting/integration/smoke/autoscaling/client.go b/internal/awstesting/integration/smoke/autoscaling/client.go
similarity index 100%
rename from awstesting/integration/smoke/autoscaling/client.go
rename to internal/awstesting/integration/smoke/autoscaling/client.go
diff --git a/awstesting/integration/smoke/cloudformation/client.go b/internal/awstesting/integration/smoke/cloudformation/client.go
similarity index 100%
rename from awstesting/integration/smoke/cloudformation/client.go
rename to internal/awstesting/integration/smoke/cloudformation/client.go
diff --git a/awstesting/integration/smoke/cloudformation/cloudformation.feature b/internal/awstesting/integration/smoke/cloudformation/cloudformation.feature
similarity index 100%
rename from awstesting/integration/smoke/cloudformation/cloudformation.feature
rename to internal/awstesting/integration/smoke/cloudformation/cloudformation.feature
diff --git a/awstesting/integration/smoke/cloudfront/client.go b/internal/awstesting/integration/smoke/cloudfront/client.go
similarity index 100%
rename from awstesting/integration/smoke/cloudfront/client.go
rename to internal/awstesting/integration/smoke/cloudfront/client.go
diff --git a/awstesting/integration/smoke/cloudfront/cloudfront.feature b/internal/awstesting/integration/smoke/cloudfront/cloudfront.feature
similarity index 100%
rename from awstesting/integration/smoke/cloudfront/cloudfront.feature
rename to internal/awstesting/integration/smoke/cloudfront/cloudfront.feature
diff --git a/awstesting/integration/smoke/cloudhsm/client.go b/internal/awstesting/integration/smoke/cloudhsm/client.go
similarity index 100%
rename from awstesting/integration/smoke/cloudhsm/client.go
rename to internal/awstesting/integration/smoke/cloudhsm/client.go
diff --git a/awstesting/integration/smoke/cloudhsm/cloudhsm.feature b/internal/awstesting/integration/smoke/cloudhsm/cloudhsm.feature
similarity index 100%
rename from awstesting/integration/smoke/cloudhsm/cloudhsm.feature
rename to internal/awstesting/integration/smoke/cloudhsm/cloudhsm.feature
diff --git a/awstesting/integration/smoke/cloudsearch/client.go b/internal/awstesting/integration/smoke/cloudsearch/client.go
similarity index 100%
rename from awstesting/integration/smoke/cloudsearch/client.go
rename to internal/awstesting/integration/smoke/cloudsearch/client.go
diff --git a/awstesting/integration/smoke/cloudsearch/cloudsearch.feature b/internal/awstesting/integration/smoke/cloudsearch/cloudsearch.feature
similarity index 100%
rename from awstesting/integration/smoke/cloudsearch/cloudsearch.feature
rename to internal/awstesting/integration/smoke/cloudsearch/cloudsearch.feature
diff --git a/awstesting/integration/smoke/cloudtrail/client.go b/internal/awstesting/integration/smoke/cloudtrail/client.go
similarity index 100%
rename from awstesting/integration/smoke/cloudtrail/client.go
rename to internal/awstesting/integration/smoke/cloudtrail/client.go
diff --git a/awstesting/integration/smoke/cloudtrail/cloudtrail.feature b/internal/awstesting/integration/smoke/cloudtrail/cloudtrail.feature
similarity index 100%
rename from awstesting/integration/smoke/cloudtrail/cloudtrail.feature
rename to internal/awstesting/integration/smoke/cloudtrail/cloudtrail.feature
diff --git a/awstesting/integration/smoke/cloudwatch/client.go b/internal/awstesting/integration/smoke/cloudwatch/client.go
similarity index 100%
rename from awstesting/integration/smoke/cloudwatch/client.go
rename to internal/awstesting/integration/smoke/cloudwatch/client.go
diff --git a/awstesting/integration/smoke/cloudwatch/cloudwatch.feature b/internal/awstesting/integration/smoke/cloudwatch/cloudwatch.feature
similarity index 100%
rename from awstesting/integration/smoke/cloudwatch/cloudwatch.feature
rename to internal/awstesting/integration/smoke/cloudwatch/cloudwatch.feature
diff --git a/awstesting/integration/smoke/cloudwatchlogs/client.go b/internal/awstesting/integration/smoke/cloudwatchlogs/client.go
similarity index 100%
rename from awstesting/integration/smoke/cloudwatchlogs/client.go
rename to internal/awstesting/integration/smoke/cloudwatchlogs/client.go
diff --git a/awstesting/integration/smoke/cloudwatchlogs/cloudwatchlogs.feature b/internal/awstesting/integration/smoke/cloudwatchlogs/cloudwatchlogs.feature
similarity index 100%
rename from awstesting/integration/smoke/cloudwatchlogs/cloudwatchlogs.feature
rename to internal/awstesting/integration/smoke/cloudwatchlogs/cloudwatchlogs.feature
diff --git a/awstesting/integration/smoke/codecommit/client.go b/internal/awstesting/integration/smoke/codecommit/client.go
similarity index 100%
rename from awstesting/integration/smoke/codecommit/client.go
rename to internal/awstesting/integration/smoke/codecommit/client.go
diff --git a/awstesting/integration/smoke/codecommit/codecommit.feature b/internal/awstesting/integration/smoke/codecommit/codecommit.feature
similarity index 100%
rename from awstesting/integration/smoke/codecommit/codecommit.feature
rename to internal/awstesting/integration/smoke/codecommit/codecommit.feature
diff --git a/awstesting/integration/smoke/codedeploy/client.go b/internal/awstesting/integration/smoke/codedeploy/client.go
similarity index 100%
rename from awstesting/integration/smoke/codedeploy/client.go
rename to internal/awstesting/integration/smoke/codedeploy/client.go
diff --git a/awstesting/integration/smoke/codedeploy/codedeploy.feature b/internal/awstesting/integration/smoke/codedeploy/codedeploy.feature
similarity index 100%
rename from awstesting/integration/smoke/codedeploy/codedeploy.feature
rename to internal/awstesting/integration/smoke/codedeploy/codedeploy.feature
diff --git a/awstesting/integration/smoke/codepipeline/client.go b/internal/awstesting/integration/smoke/codepipeline/client.go
similarity index 100%
rename from awstesting/integration/smoke/codepipeline/client.go
rename to internal/awstesting/integration/smoke/codepipeline/client.go
diff --git a/awstesting/integration/smoke/codepipeline/codepipeline.feature b/internal/awstesting/integration/smoke/codepipeline/codepipeline.feature
similarity index 100%
rename from awstesting/integration/smoke/codepipeline/codepipeline.feature
rename to internal/awstesting/integration/smoke/codepipeline/codepipeline.feature
diff --git a/awstesting/integration/smoke/cognitoidentity/client.go b/internal/awstesting/integration/smoke/cognitoidentity/client.go
similarity index 100%
rename from awstesting/integration/smoke/cognitoidentity/client.go
rename to internal/awstesting/integration/smoke/cognitoidentity/client.go
diff --git a/awstesting/integration/smoke/cognitoidentity/cognitoidentity.feature b/internal/awstesting/integration/smoke/cognitoidentity/cognitoidentity.feature
similarity index 100%
rename from awstesting/integration/smoke/cognitoidentity/cognitoidentity.feature
rename to internal/awstesting/integration/smoke/cognitoidentity/cognitoidentity.feature
diff --git a/awstesting/integration/smoke/cognitosync/client.go b/internal/awstesting/integration/smoke/cognitosync/client.go
similarity index 100%
rename from awstesting/integration/smoke/cognitosync/client.go
rename to internal/awstesting/integration/smoke/cognitosync/client.go
diff --git a/awstesting/integration/smoke/cognitosync/cognitosync.feature b/internal/awstesting/integration/smoke/cognitosync/cognitosync.feature
similarity index 100%
rename from awstesting/integration/smoke/cognitosync/cognitosync.feature
rename to internal/awstesting/integration/smoke/cognitosync/cognitosync.feature
diff --git a/awstesting/integration/smoke/configservice/client.go b/internal/awstesting/integration/smoke/configservice/client.go
similarity index 100%
rename from awstesting/integration/smoke/configservice/client.go
rename to internal/awstesting/integration/smoke/configservice/client.go
diff --git a/awstesting/integration/smoke/configservice/configservice.feature b/internal/awstesting/integration/smoke/configservice/configservice.feature
similarity index 100%
rename from awstesting/integration/smoke/configservice/configservice.feature
rename to internal/awstesting/integration/smoke/configservice/configservice.feature
diff --git a/awstesting/integration/smoke/datapipeline/client.go b/internal/awstesting/integration/smoke/datapipeline/client.go
similarity index 100%
rename from awstesting/integration/smoke/datapipeline/client.go
rename to internal/awstesting/integration/smoke/datapipeline/client.go
diff --git a/awstesting/integration/smoke/datapipeline/datapipeline.feature b/internal/awstesting/integration/smoke/datapipeline/datapipeline.feature
similarity index 100%
rename from awstesting/integration/smoke/datapipeline/datapipeline.feature
rename to internal/awstesting/integration/smoke/datapipeline/datapipeline.feature
diff --git a/awstesting/integration/smoke/devicefarm/client.go b/internal/awstesting/integration/smoke/devicefarm/client.go
similarity index 100%
rename from awstesting/integration/smoke/devicefarm/client.go
rename to internal/awstesting/integration/smoke/devicefarm/client.go
diff --git a/awstesting/integration/smoke/devicefarm/devicefarm.feature b/internal/awstesting/integration/smoke/devicefarm/devicefarm.feature
similarity index 100%
rename from awstesting/integration/smoke/devicefarm/devicefarm.feature
rename to internal/awstesting/integration/smoke/devicefarm/devicefarm.feature
diff --git a/awstesting/integration/smoke/directconnect/client.go b/internal/awstesting/integration/smoke/directconnect/client.go
similarity index 100%
rename from awstesting/integration/smoke/directconnect/client.go
rename to internal/awstesting/integration/smoke/directconnect/client.go
diff --git a/awstesting/integration/smoke/directconnect/directconnect.feature b/internal/awstesting/integration/smoke/directconnect/directconnect.feature
similarity index 100%
rename from awstesting/integration/smoke/directconnect/directconnect.feature
rename to internal/awstesting/integration/smoke/directconnect/directconnect.feature
diff --git a/awstesting/integration/smoke/directoryservice/client.go b/internal/awstesting/integration/smoke/directoryservice/client.go
similarity index 100%
rename from awstesting/integration/smoke/directoryservice/client.go
rename to internal/awstesting/integration/smoke/directoryservice/client.go
diff --git a/awstesting/integration/smoke/directoryservice/directoryservice.feature b/internal/awstesting/integration/smoke/directoryservice/directoryservice.feature
similarity index 100%
rename from awstesting/integration/smoke/directoryservice/directoryservice.feature
rename to internal/awstesting/integration/smoke/directoryservice/directoryservice.feature
diff --git a/awstesting/integration/smoke/dynamodb/client.go b/internal/awstesting/integration/smoke/dynamodb/client.go
similarity index 100%
rename from awstesting/integration/smoke/dynamodb/client.go
rename to internal/awstesting/integration/smoke/dynamodb/client.go
diff --git a/awstesting/integration/smoke/dynamodb/dynamodb.feature b/internal/awstesting/integration/smoke/dynamodb/dynamodb.feature
similarity index 100%
rename from awstesting/integration/smoke/dynamodb/dynamodb.feature
rename to internal/awstesting/integration/smoke/dynamodb/dynamodb.feature
diff --git a/awstesting/integration/smoke/dynamodbstreams/client.go b/internal/awstesting/integration/smoke/dynamodbstreams/client.go
similarity index 100%
rename from awstesting/integration/smoke/dynamodbstreams/client.go
rename to internal/awstesting/integration/smoke/dynamodbstreams/client.go
diff --git a/awstesting/integration/smoke/dynamodbstreams/dynamodbstreams.feature b/internal/awstesting/integration/smoke/dynamodbstreams/dynamodbstreams.feature
similarity index 100%
rename from awstesting/integration/smoke/dynamodbstreams/dynamodbstreams.feature
rename to internal/awstesting/integration/smoke/dynamodbstreams/dynamodbstreams.feature
diff --git a/awstesting/integration/smoke/ec2/client.go b/internal/awstesting/integration/smoke/ec2/client.go
similarity index 100%
rename from awstesting/integration/smoke/ec2/client.go
rename to internal/awstesting/integration/smoke/ec2/client.go
diff --git a/awstesting/integration/smoke/ec2/ec2.feature b/internal/awstesting/integration/smoke/ec2/ec2.feature
similarity index 100%
rename from awstesting/integration/smoke/ec2/ec2.feature
rename to internal/awstesting/integration/smoke/ec2/ec2.feature
diff --git a/awstesting/integration/smoke/ecs/client.go b/internal/awstesting/integration/smoke/ecs/client.go
similarity index 100%
rename from awstesting/integration/smoke/ecs/client.go
rename to internal/awstesting/integration/smoke/ecs/client.go
diff --git a/awstesting/integration/smoke/ecs/ecs.feature b/internal/awstesting/integration/smoke/ecs/ecs.feature
similarity index 100%
rename from awstesting/integration/smoke/ecs/ecs.feature
rename to internal/awstesting/integration/smoke/ecs/ecs.feature
diff --git a/awstesting/integration/smoke/efs/client.go b/internal/awstesting/integration/smoke/efs/client.go
similarity index 100%
rename from awstesting/integration/smoke/efs/client.go
rename to internal/awstesting/integration/smoke/efs/client.go
diff --git a/awstesting/integration/smoke/efs/efs.feature b/internal/awstesting/integration/smoke/efs/efs.feature
similarity index 100%
rename from awstesting/integration/smoke/efs/efs.feature
rename to internal/awstesting/integration/smoke/efs/efs.feature
diff --git a/awstesting/integration/smoke/elasticache/client.go b/internal/awstesting/integration/smoke/elasticache/client.go
similarity index 100%
rename from awstesting/integration/smoke/elasticache/client.go
rename to internal/awstesting/integration/smoke/elasticache/client.go
diff --git a/awstesting/integration/smoke/elasticache/elasticache.feature b/internal/awstesting/integration/smoke/elasticache/elasticache.feature
similarity index 100%
rename from awstesting/integration/smoke/elasticache/elasticache.feature
rename to internal/awstesting/integration/smoke/elasticache/elasticache.feature
diff --git a/awstesting/integration/smoke/elasticbeanstalk/client.go b/internal/awstesting/integration/smoke/elasticbeanstalk/client.go
similarity index 100%
rename from awstesting/integration/smoke/elasticbeanstalk/client.go
rename to internal/awstesting/integration/smoke/elasticbeanstalk/client.go
diff --git a/awstesting/integration/smoke/elasticbeanstalk/elasticbeanstalk.feature b/internal/awstesting/integration/smoke/elasticbeanstalk/elasticbeanstalk.feature
similarity index 100%
rename from awstesting/integration/smoke/elasticbeanstalk/elasticbeanstalk.feature
rename to internal/awstesting/integration/smoke/elasticbeanstalk/elasticbeanstalk.feature
diff --git a/awstesting/integration/smoke/elasticloadbalancing/client.go b/internal/awstesting/integration/smoke/elasticloadbalancing/client.go
similarity index 100%
rename from awstesting/integration/smoke/elasticloadbalancing/client.go
rename to internal/awstesting/integration/smoke/elasticloadbalancing/client.go
diff --git a/awstesting/integration/smoke/elasticloadbalancing/elasticloadbalancing.feature b/internal/awstesting/integration/smoke/elasticloadbalancing/elasticloadbalancing.feature
similarity index 100%
rename from awstesting/integration/smoke/elasticloadbalancing/elasticloadbalancing.feature
rename to internal/awstesting/integration/smoke/elasticloadbalancing/elasticloadbalancing.feature
diff --git a/awstesting/integration/smoke/elastictranscoder/client.go b/internal/awstesting/integration/smoke/elastictranscoder/client.go
similarity index 100%
rename from awstesting/integration/smoke/elastictranscoder/client.go
rename to internal/awstesting/integration/smoke/elastictranscoder/client.go
diff --git a/awstesting/integration/smoke/elastictranscoder/elastictranscoder.feature b/internal/awstesting/integration/smoke/elastictranscoder/elastictranscoder.feature
similarity index 100%
rename from awstesting/integration/smoke/elastictranscoder/elastictranscoder.feature
rename to internal/awstesting/integration/smoke/elastictranscoder/elastictranscoder.feature
diff --git a/awstesting/integration/smoke/emr/client.go b/internal/awstesting/integration/smoke/emr/client.go
similarity index 100%
rename from awstesting/integration/smoke/emr/client.go
rename to internal/awstesting/integration/smoke/emr/client.go
diff --git a/awstesting/integration/smoke/emr/emr.feature b/internal/awstesting/integration/smoke/emr/emr.feature
similarity index 100%
rename from awstesting/integration/smoke/emr/emr.feature
rename to internal/awstesting/integration/smoke/emr/emr.feature
diff --git a/awstesting/integration/smoke/es/client.go b/internal/awstesting/integration/smoke/es/client.go
similarity index 100%
rename from awstesting/integration/smoke/es/client.go
rename to internal/awstesting/integration/smoke/es/client.go
diff --git a/awstesting/integration/smoke/es/es.feature b/internal/awstesting/integration/smoke/es/es.feature
similarity index 100%
rename from awstesting/integration/smoke/es/es.feature
rename to internal/awstesting/integration/smoke/es/es.feature
diff --git a/awstesting/integration/smoke/glacier/client.go b/internal/awstesting/integration/smoke/glacier/client.go
similarity index 100%
rename from awstesting/integration/smoke/glacier/client.go
rename to internal/awstesting/integration/smoke/glacier/client.go
diff --git a/awstesting/integration/smoke/glacier/glacier.feature b/internal/awstesting/integration/smoke/glacier/glacier.feature
similarity index 100%
rename from awstesting/integration/smoke/glacier/glacier.feature
rename to internal/awstesting/integration/smoke/glacier/glacier.feature
diff --git a/awstesting/integration/smoke/iam/client.go b/internal/awstesting/integration/smoke/iam/client.go
similarity index 100%
rename from awstesting/integration/smoke/iam/client.go
rename to internal/awstesting/integration/smoke/iam/client.go
diff --git a/awstesting/integration/smoke/iam/iam.feature b/internal/awstesting/integration/smoke/iam/iam.feature
similarity index 100%
rename from awstesting/integration/smoke/iam/iam.feature
rename to internal/awstesting/integration/smoke/iam/iam.feature
diff --git a/awstesting/integration/smoke/iotdataplane/client.go b/internal/awstesting/integration/smoke/iotdataplane/client.go
similarity index 100%
rename from awstesting/integration/smoke/iotdataplane/client.go
rename to internal/awstesting/integration/smoke/iotdataplane/client.go
diff --git a/awstesting/integration/smoke/iotdataplane/iotdataplane.feature b/internal/awstesting/integration/smoke/iotdataplane/iotdataplane.feature
similarity index 100%
rename from awstesting/integration/smoke/iotdataplane/iotdataplane.feature
rename to internal/awstesting/integration/smoke/iotdataplane/iotdataplane.feature
diff --git a/awstesting/integration/smoke/kinesis/client.go b/internal/awstesting/integration/smoke/kinesis/client.go
similarity index 100%
rename from awstesting/integration/smoke/kinesis/client.go
rename to internal/awstesting/integration/smoke/kinesis/client.go
diff --git a/awstesting/integration/smoke/kinesis/kinesis.feature b/internal/awstesting/integration/smoke/kinesis/kinesis.feature
similarity index 100%
rename from awstesting/integration/smoke/kinesis/kinesis.feature
rename to internal/awstesting/integration/smoke/kinesis/kinesis.feature
diff --git a/awstesting/integration/smoke/kms/client.go b/internal/awstesting/integration/smoke/kms/client.go
similarity index 100%
rename from awstesting/integration/smoke/kms/client.go
rename to internal/awstesting/integration/smoke/kms/client.go
diff --git a/awstesting/integration/smoke/kms/kms.feature b/internal/awstesting/integration/smoke/kms/kms.feature
similarity index 100%
rename from awstesting/integration/smoke/kms/kms.feature
rename to internal/awstesting/integration/smoke/kms/kms.feature
diff --git a/awstesting/integration/smoke/lambda/client.go b/internal/awstesting/integration/smoke/lambda/client.go
similarity index 100%
rename from awstesting/integration/smoke/lambda/client.go
rename to internal/awstesting/integration/smoke/lambda/client.go
diff --git a/awstesting/integration/smoke/lambda/lambda.feature b/internal/awstesting/integration/smoke/lambda/lambda.feature
similarity index 100%
rename from awstesting/integration/smoke/lambda/lambda.feature
rename to internal/awstesting/integration/smoke/lambda/lambda.feature
diff --git a/awstesting/integration/smoke/machinelearning/client.go b/internal/awstesting/integration/smoke/machinelearning/client.go
similarity index 100%
rename from awstesting/integration/smoke/machinelearning/client.go
rename to internal/awstesting/integration/smoke/machinelearning/client.go
diff --git a/awstesting/integration/smoke/machinelearning/machinelearning.feature b/internal/awstesting/integration/smoke/machinelearning/machinelearning.feature
similarity index 100%
rename from awstesting/integration/smoke/machinelearning/machinelearning.feature
rename to internal/awstesting/integration/smoke/machinelearning/machinelearning.feature
diff --git a/awstesting/integration/smoke/opsworks/client.go b/internal/awstesting/integration/smoke/opsworks/client.go
similarity index 100%
rename from awstesting/integration/smoke/opsworks/client.go
rename to internal/awstesting/integration/smoke/opsworks/client.go
diff --git a/awstesting/integration/smoke/opsworks/opsworks.feature b/internal/awstesting/integration/smoke/opsworks/opsworks.feature
similarity index 100%
rename from awstesting/integration/smoke/opsworks/opsworks.feature
rename to internal/awstesting/integration/smoke/opsworks/opsworks.feature
diff --git a/awstesting/integration/smoke/rds/client.go b/internal/awstesting/integration/smoke/rds/client.go
similarity index 100%
rename from awstesting/integration/smoke/rds/client.go
rename to internal/awstesting/integration/smoke/rds/client.go
diff --git a/awstesting/integration/smoke/rds/rds.feature b/internal/awstesting/integration/smoke/rds/rds.feature
similarity index 100%
rename from awstesting/integration/smoke/rds/rds.feature
rename to internal/awstesting/integration/smoke/rds/rds.feature
diff --git a/awstesting/integration/smoke/redshift/client.go b/internal/awstesting/integration/smoke/redshift/client.go
similarity index 100%
rename from awstesting/integration/smoke/redshift/client.go
rename to internal/awstesting/integration/smoke/redshift/client.go
diff --git a/awstesting/integration/smoke/redshift/redshift.feature b/internal/awstesting/integration/smoke/redshift/redshift.feature
similarity index 100%
rename from awstesting/integration/smoke/redshift/redshift.feature
rename to internal/awstesting/integration/smoke/redshift/redshift.feature
diff --git a/awstesting/integration/smoke/route53/client.go b/internal/awstesting/integration/smoke/route53/client.go
similarity index 100%
rename from awstesting/integration/smoke/route53/client.go
rename to internal/awstesting/integration/smoke/route53/client.go
diff --git a/awstesting/integration/smoke/route53/route53.feature b/internal/awstesting/integration/smoke/route53/route53.feature
similarity index 100%
rename from awstesting/integration/smoke/route53/route53.feature
rename to internal/awstesting/integration/smoke/route53/route53.feature
diff --git a/awstesting/integration/smoke/route53domains/client.go b/internal/awstesting/integration/smoke/route53domains/client.go
similarity index 100%
rename from awstesting/integration/smoke/route53domains/client.go
rename to internal/awstesting/integration/smoke/route53domains/client.go
diff --git a/awstesting/integration/smoke/route53domains/route53domains.feature b/internal/awstesting/integration/smoke/route53domains/route53domains.feature
similarity index 100%
rename from awstesting/integration/smoke/route53domains/route53domains.feature
rename to internal/awstesting/integration/smoke/route53domains/route53domains.feature
diff --git a/awstesting/integration/smoke/ses/client.go b/internal/awstesting/integration/smoke/ses/client.go
similarity index 100%
rename from awstesting/integration/smoke/ses/client.go
rename to internal/awstesting/integration/smoke/ses/client.go
diff --git a/awstesting/integration/smoke/ses/ses.feature b/internal/awstesting/integration/smoke/ses/ses.feature
similarity index 100%
rename from awstesting/integration/smoke/ses/ses.feature
rename to internal/awstesting/integration/smoke/ses/ses.feature
diff --git a/awstesting/integration/smoke/shared.go b/internal/awstesting/integration/smoke/shared.go
similarity index 100%
rename from awstesting/integration/smoke/shared.go
rename to internal/awstesting/integration/smoke/shared.go
diff --git a/awstesting/integration/smoke/simpledb/client.go b/internal/awstesting/integration/smoke/simpledb/client.go
similarity index 100%
rename from awstesting/integration/smoke/simpledb/client.go
rename to internal/awstesting/integration/smoke/simpledb/client.go
diff --git a/awstesting/integration/smoke/simpledb/simpledb.feature b/internal/awstesting/integration/smoke/simpledb/simpledb.feature
similarity index 100%
rename from awstesting/integration/smoke/simpledb/simpledb.feature
rename to internal/awstesting/integration/smoke/simpledb/simpledb.feature
diff --git a/awstesting/integration/smoke/sns/client.go b/internal/awstesting/integration/smoke/sns/client.go
similarity index 100%
rename from awstesting/integration/smoke/sns/client.go
rename to internal/awstesting/integration/smoke/sns/client.go
diff --git a/awstesting/integration/smoke/sns/sns.feature b/internal/awstesting/integration/smoke/sns/sns.feature
similarity index 100%
rename from awstesting/integration/smoke/sns/sns.feature
rename to internal/awstesting/integration/smoke/sns/sns.feature
diff --git a/awstesting/integration/smoke/sqs/client.go b/internal/awstesting/integration/smoke/sqs/client.go
similarity index 100%
rename from awstesting/integration/smoke/sqs/client.go
rename to internal/awstesting/integration/smoke/sqs/client.go
diff --git a/awstesting/integration/smoke/sqs/sqs.feature b/internal/awstesting/integration/smoke/sqs/sqs.feature
similarity index 100%
rename from awstesting/integration/smoke/sqs/sqs.feature
rename to internal/awstesting/integration/smoke/sqs/sqs.feature
diff --git a/awstesting/integration/smoke/ssm/client.go b/internal/awstesting/integration/smoke/ssm/client.go
similarity index 100%
rename from awstesting/integration/smoke/ssm/client.go
rename to internal/awstesting/integration/smoke/ssm/client.go
diff --git a/awstesting/integration/smoke/ssm/ssm.feature b/internal/awstesting/integration/smoke/ssm/ssm.feature
similarity index 100%
rename from awstesting/integration/smoke/ssm/ssm.feature
rename to internal/awstesting/integration/smoke/ssm/ssm.feature
diff --git a/awstesting/integration/smoke/storagegateway/client.go b/internal/awstesting/integration/smoke/storagegateway/client.go
similarity index 100%
rename from awstesting/integration/smoke/storagegateway/client.go
rename to internal/awstesting/integration/smoke/storagegateway/client.go
diff --git a/awstesting/integration/smoke/storagegateway/storagegateway.feature b/internal/awstesting/integration/smoke/storagegateway/storagegateway.feature
similarity index 100%
rename from awstesting/integration/smoke/storagegateway/storagegateway.feature
rename to internal/awstesting/integration/smoke/storagegateway/storagegateway.feature
diff --git a/awstesting/integration/smoke/sts/client.go b/internal/awstesting/integration/smoke/sts/client.go
similarity index 100%
rename from awstesting/integration/smoke/sts/client.go
rename to internal/awstesting/integration/smoke/sts/client.go
diff --git a/awstesting/integration/smoke/sts/sts.feature b/internal/awstesting/integration/smoke/sts/sts.feature
similarity index 100%
rename from awstesting/integration/smoke/sts/sts.feature
rename to internal/awstesting/integration/smoke/sts/sts.feature
diff --git a/awstesting/integration/smoke/support/client.go b/internal/awstesting/integration/smoke/support/client.go
similarity index 100%
rename from awstesting/integration/smoke/support/client.go
rename to internal/awstesting/integration/smoke/support/client.go
diff --git a/awstesting/integration/smoke/support/support.feature b/internal/awstesting/integration/smoke/support/support.feature
similarity index 100%
rename from awstesting/integration/smoke/support/support.feature
rename to internal/awstesting/integration/smoke/support/support.feature
diff --git a/awstesting/integration/smoke/swf/client.go b/internal/awstesting/integration/smoke/swf/client.go
similarity index 100%
rename from awstesting/integration/smoke/swf/client.go
rename to internal/awstesting/integration/smoke/swf/client.go
diff --git a/awstesting/integration/smoke/swf/swf.feature b/internal/awstesting/integration/smoke/swf/swf.feature
similarity index 100%
rename from awstesting/integration/smoke/swf/swf.feature
rename to internal/awstesting/integration/smoke/swf/swf.feature
diff --git a/awstesting/integration/smoke/waf/client.go b/internal/awstesting/integration/smoke/waf/client.go
similarity index 100%
rename from awstesting/integration/smoke/waf/client.go
rename to internal/awstesting/integration/smoke/waf/client.go
diff --git a/awstesting/integration/smoke/waf/waf.feature b/internal/awstesting/integration/smoke/waf/waf.feature
similarity index 100%
rename from awstesting/integration/smoke/waf/waf.feature
rename to internal/awstesting/integration/smoke/waf/waf.feature
diff --git a/awstesting/integration/smoke/workspaces/client.go b/internal/awstesting/integration/smoke/workspaces/client.go
similarity index 100%
rename from awstesting/integration/smoke/workspaces/client.go
rename to internal/awstesting/integration/smoke/workspaces/client.go
diff --git a/awstesting/integration/smoke/workspaces/workspaces.feature b/internal/awstesting/integration/smoke/workspaces/workspaces.feature
similarity index 100%
rename from awstesting/integration/smoke/workspaces/workspaces.feature
rename to internal/awstesting/integration/smoke/workspaces/workspaces.feature
diff --git a/awstesting/mock/mock.go b/internal/awstesting/mock/mock.go
similarity index 100%
rename from awstesting/mock/mock.go
rename to internal/awstesting/mock/mock.go
diff --git a/awstesting/performance/benchmarks.go b/internal/awstesting/performance/benchmarks.go
similarity index 100%
rename from awstesting/performance/benchmarks.go
rename to internal/awstesting/performance/benchmarks.go
diff --git a/awstesting/performance/client.go b/internal/awstesting/performance/client.go
similarity index 100%
rename from awstesting/performance/client.go
rename to internal/awstesting/performance/client.go
diff --git a/awstesting/performance/clients.feature b/internal/awstesting/performance/clients.feature
similarity index 100%
rename from awstesting/performance/clients.feature
rename to internal/awstesting/performance/clients.feature
diff --git a/awstesting/performance/clients.go b/internal/awstesting/performance/clients.go
similarity index 100%
rename from awstesting/performance/clients.go
rename to internal/awstesting/performance/clients.go
diff --git a/awstesting/performance/init.go b/internal/awstesting/performance/init.go
similarity index 100%
rename from awstesting/performance/init.go
rename to internal/awstesting/performance/init.go
diff --git a/awstesting/performance/logging.go b/internal/awstesting/performance/logging.go
similarity index 100%
rename from awstesting/performance/logging.go
rename to internal/awstesting/performance/logging.go
diff --git a/awstesting/performance/streaming.feature b/internal/awstesting/performance/streaming.feature
similarity index 100%
rename from awstesting/performance/streaming.feature
rename to internal/awstesting/performance/streaming.feature
diff --git a/awstesting/sandbox/Dockerfile.golang-tip b/internal/awstesting/sandbox/Dockerfile.golang-tip
similarity index 100%
rename from awstesting/sandbox/Dockerfile.golang-tip
rename to internal/awstesting/sandbox/Dockerfile.golang-tip
diff --git a/awstesting/sandbox/Dockerfile.test.go1.4 b/internal/awstesting/sandbox/Dockerfile.test.go1.4
similarity index 100%
rename from awstesting/sandbox/Dockerfile.test.go1.4
rename to internal/awstesting/sandbox/Dockerfile.test.go1.4
diff --git a/awstesting/sandbox/Dockerfile.test.go1.5 b/internal/awstesting/sandbox/Dockerfile.test.go1.5
similarity index 100%
rename from awstesting/sandbox/Dockerfile.test.go1.5
rename to internal/awstesting/sandbox/Dockerfile.test.go1.5
diff --git a/awstesting/sandbox/Dockerfile.test.go1.5-novendorexp b/internal/awstesting/sandbox/Dockerfile.test.go1.5-novendorexp
similarity index 100%
rename from awstesting/sandbox/Dockerfile.test.go1.5-novendorexp
rename to internal/awstesting/sandbox/Dockerfile.test.go1.5-novendorexp
diff --git a/awstesting/sandbox/Dockerfile.test.go1.6 b/internal/awstesting/sandbox/Dockerfile.test.go1.6
similarity index 100%
rename from awstesting/sandbox/Dockerfile.test.go1.6
rename to internal/awstesting/sandbox/Dockerfile.test.go1.6
diff --git a/awstesting/sandbox/Dockerfile.test.go1.7 b/internal/awstesting/sandbox/Dockerfile.test.go1.7
similarity index 100%
rename from awstesting/sandbox/Dockerfile.test.go1.7
rename to internal/awstesting/sandbox/Dockerfile.test.go1.7
diff --git a/awstesting/sandbox/Dockerfile.test.go1.8 b/internal/awstesting/sandbox/Dockerfile.test.go1.8
similarity index 100%
rename from awstesting/sandbox/Dockerfile.test.go1.8
rename to internal/awstesting/sandbox/Dockerfile.test.go1.8
diff --git a/awstesting/sandbox/Dockerfile.test.go1.9 b/internal/awstesting/sandbox/Dockerfile.test.go1.9
similarity index 100%
rename from awstesting/sandbox/Dockerfile.test.go1.9
rename to internal/awstesting/sandbox/Dockerfile.test.go1.9
diff --git a/awstesting/sandbox/Dockerfile.test.gotip b/internal/awstesting/sandbox/Dockerfile.test.gotip
similarity index 100%
rename from awstesting/sandbox/Dockerfile.test.gotip
rename to internal/awstesting/sandbox/Dockerfile.test.gotip
diff --git a/awstesting/unit/unit.go b/internal/awstesting/unit/unit.go
similarity index 100%
rename from awstesting/unit/unit.go
rename to internal/awstesting/unit/unit.go
diff --git a/awstesting/util.go b/internal/awstesting/util.go
similarity index 100%
rename from awstesting/util.go
rename to internal/awstesting/util.go
diff --git a/awstesting/util_test.go b/internal/awstesting/util_test.go
similarity index 100%
rename from awstesting/util_test.go
rename to internal/awstesting/util_test.go