diff --git a/README.md b/README.md
index 63a3cf5..4a55cba 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Testing install size reduction on @aws-sdk/client-s3
 
 ### v0.1.0
 
-The version v0.0.1 added in [#6](https://github.com/trivikr/temp-client-s3/pull/6)
+The version v0.1.0 added in [#6](https://github.com/trivikr/temp-client-s3/pull/6)
 contains source code of **@aws-sdk/client-s3@3.28.0**
 
 ```console
@@ -16,3 +16,12 @@ package size:  1.6 MB
 unpacked size: 10.2 MB
 total files:   806
 ```
+
+### v0.2.0
+
+The version v0.2.0 added in [#7](https://github.com/trivikr/temp-client-s3/pull/7)
+publishes only files in dist folders.
+
+```console
+Update after publish
+```
diff --git a/clients/client-s3/karma.conf.js b/clients/client-s3/karma.conf.js
index e23ce94..af38eda 100644
--- a/clients/client-s3/karma.conf.js
+++ b/clients/client-s3/karma.conf.js
@@ -2,9 +2,9 @@ module.exports = function (config) {
   config.set({
     basePath: "",
     frameworks: ["mocha", "chai"],
-    files: ["e2e/**/*.ispec.ts"],
+    files: ["test/e2e/**/*.ispec.ts"],
     preprocessors: {
-      "e2e/**/*.ispec.ts": ["webpack", "sourcemap", "credentials", "env"],
+      "test/e2e/**/*.ispec.ts": ["webpack", "sourcemap", "credentials", "env"],
     },
     webpackMiddleware: {
       stats: "minimal",
diff --git a/clients/client-s3/package.json b/clients/client-s3/package.json
index 473e28f..a2306f9 100644
--- a/clients/client-s3/package.json
+++ b/clients/client-s3/package.json
@@ -3,28 +3,30 @@
   "description": "Testing install size reduction in @aws-sdk/client-s3",
   "version": "0.1.0",
   "scripts": {
-    "clean": "yarn remove-definitions && yarn remove-dist && yarn remove-documentation",
+    "clean": "yarn remove-dist && yarn remove-documentation",
     "build-documentation": "yarn remove-documentation && typedoc ./",
-    "remove-definitions": "rimraf ./types",
-    "remove-dist": "rimraf ./dist",
+    "remove-dist": "rimraf ./dist-*",
     "remove-documentation": "rimraf ./docs",
-    "test:unit": "mocha **/cjs/**/*.spec.js",
-    "test:e2e": "mocha **/cjs/**/*.ispec.js && karma start karma.conf.js",
+    "test:unit": "ts-mocha src/**/*.spec.ts",
+    "test:e2e": "ts-mocha test/**/*.ispec.ts && karma start karma.conf.js",
     "test": "yarn test:unit",
     "build:cjs": "tsc -p tsconfig.json",
     "build:es": "tsc -p tsconfig.es.json",
     "build": "yarn build:cjs && yarn build:es",
-    "downlevel-dts": "downlevel-dts dist/types dist/types/ts3.4"
+    "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4"
   },
-  "main": "./dist/cjs/index.js",
-  "types": "./dist/types/index.d.ts",
-  "module": "./dist/es/index.js",
+  "main": "./dist-cjs/index.js",
+  "types": "./dist-types/index.d.ts",
+  "module": "./dist-es/index.js",
   "browser": {
     "./runtimeConfig": "./runtimeConfig.browser"
   },
   "react-native": {
     "./runtimeConfig": "./runtimeConfig.native"
   },
+  "files": [
+    "dist-*"
+  ],
   "sideEffects": false,
   "dependencies": {
     "@aws-crypto/sha256-browser": "^1.0.0",
@@ -92,8 +94,8 @@
   },
   "typesVersions": {
     "<4.0": {
-      "dist/types/*": [
-        "dist/types/ts3.4/*"
+      "dist-types/*": [
+        "dist-types/ts3.4/*"
       ]
     }
   },
diff --git a/clients/client-s3/S3.spec.ts b/clients/client-s3/src/S3.spec.ts
similarity index 100%
rename from clients/client-s3/S3.spec.ts
rename to clients/client-s3/src/S3.spec.ts
diff --git a/clients/client-s3/S3.ts b/clients/client-s3/src/S3.ts
similarity index 100%
rename from clients/client-s3/S3.ts
rename to clients/client-s3/src/S3.ts
diff --git a/clients/client-s3/S3Client.ts b/clients/client-s3/src/S3Client.ts
similarity index 100%
rename from clients/client-s3/S3Client.ts
rename to clients/client-s3/src/S3Client.ts
diff --git a/clients/client-s3/commands/AbortMultipartUploadCommand.ts b/clients/client-s3/src/commands/AbortMultipartUploadCommand.ts
similarity index 100%
rename from clients/client-s3/commands/AbortMultipartUploadCommand.ts
rename to clients/client-s3/src/commands/AbortMultipartUploadCommand.ts
diff --git a/clients/client-s3/commands/CompleteMultipartUploadCommand.ts b/clients/client-s3/src/commands/CompleteMultipartUploadCommand.ts
similarity index 100%
rename from clients/client-s3/commands/CompleteMultipartUploadCommand.ts
rename to clients/client-s3/src/commands/CompleteMultipartUploadCommand.ts
diff --git a/clients/client-s3/commands/CopyObjectCommand.ts b/clients/client-s3/src/commands/CopyObjectCommand.ts
similarity index 100%
rename from clients/client-s3/commands/CopyObjectCommand.ts
rename to clients/client-s3/src/commands/CopyObjectCommand.ts
diff --git a/clients/client-s3/commands/CreateBucketCommand.ts b/clients/client-s3/src/commands/CreateBucketCommand.ts
similarity index 100%
rename from clients/client-s3/commands/CreateBucketCommand.ts
rename to clients/client-s3/src/commands/CreateBucketCommand.ts
diff --git a/clients/client-s3/commands/CreateMultipartUploadCommand.ts b/clients/client-s3/src/commands/CreateMultipartUploadCommand.ts
similarity index 100%
rename from clients/client-s3/commands/CreateMultipartUploadCommand.ts
rename to clients/client-s3/src/commands/CreateMultipartUploadCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketAnalyticsConfigurationCommand.ts b/clients/client-s3/src/commands/DeleteBucketAnalyticsConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketAnalyticsConfigurationCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketAnalyticsConfigurationCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketCommand.ts b/clients/client-s3/src/commands/DeleteBucketCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketCorsCommand.ts b/clients/client-s3/src/commands/DeleteBucketCorsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketCorsCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketCorsCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketEncryptionCommand.ts b/clients/client-s3/src/commands/DeleteBucketEncryptionCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketEncryptionCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketEncryptionCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketIntelligentTieringConfigurationCommand.ts b/clients/client-s3/src/commands/DeleteBucketIntelligentTieringConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketIntelligentTieringConfigurationCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketIntelligentTieringConfigurationCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketInventoryConfigurationCommand.ts b/clients/client-s3/src/commands/DeleteBucketInventoryConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketInventoryConfigurationCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketInventoryConfigurationCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketLifecycleCommand.ts b/clients/client-s3/src/commands/DeleteBucketLifecycleCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketLifecycleCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketLifecycleCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketMetricsConfigurationCommand.ts b/clients/client-s3/src/commands/DeleteBucketMetricsConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketMetricsConfigurationCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketMetricsConfigurationCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketOwnershipControlsCommand.ts b/clients/client-s3/src/commands/DeleteBucketOwnershipControlsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketOwnershipControlsCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketOwnershipControlsCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketPolicyCommand.ts b/clients/client-s3/src/commands/DeleteBucketPolicyCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketPolicyCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketPolicyCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketReplicationCommand.ts b/clients/client-s3/src/commands/DeleteBucketReplicationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketReplicationCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketReplicationCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketTaggingCommand.ts b/clients/client-s3/src/commands/DeleteBucketTaggingCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketTaggingCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketTaggingCommand.ts
diff --git a/clients/client-s3/commands/DeleteBucketWebsiteCommand.ts b/clients/client-s3/src/commands/DeleteBucketWebsiteCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteBucketWebsiteCommand.ts
rename to clients/client-s3/src/commands/DeleteBucketWebsiteCommand.ts
diff --git a/clients/client-s3/commands/DeleteObjectCommand.ts b/clients/client-s3/src/commands/DeleteObjectCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteObjectCommand.ts
rename to clients/client-s3/src/commands/DeleteObjectCommand.ts
diff --git a/clients/client-s3/commands/DeleteObjectTaggingCommand.ts b/clients/client-s3/src/commands/DeleteObjectTaggingCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteObjectTaggingCommand.ts
rename to clients/client-s3/src/commands/DeleteObjectTaggingCommand.ts
diff --git a/clients/client-s3/commands/DeleteObjectsCommand.ts b/clients/client-s3/src/commands/DeleteObjectsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeleteObjectsCommand.ts
rename to clients/client-s3/src/commands/DeleteObjectsCommand.ts
diff --git a/clients/client-s3/commands/DeletePublicAccessBlockCommand.ts b/clients/client-s3/src/commands/DeletePublicAccessBlockCommand.ts
similarity index 100%
rename from clients/client-s3/commands/DeletePublicAccessBlockCommand.ts
rename to clients/client-s3/src/commands/DeletePublicAccessBlockCommand.ts
diff --git a/clients/client-s3/commands/GetBucketAccelerateConfigurationCommand.ts b/clients/client-s3/src/commands/GetBucketAccelerateConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketAccelerateConfigurationCommand.ts
rename to clients/client-s3/src/commands/GetBucketAccelerateConfigurationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketAclCommand.ts b/clients/client-s3/src/commands/GetBucketAclCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketAclCommand.ts
rename to clients/client-s3/src/commands/GetBucketAclCommand.ts
diff --git a/clients/client-s3/commands/GetBucketAnalyticsConfigurationCommand.ts b/clients/client-s3/src/commands/GetBucketAnalyticsConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketAnalyticsConfigurationCommand.ts
rename to clients/client-s3/src/commands/GetBucketAnalyticsConfigurationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketCorsCommand.ts b/clients/client-s3/src/commands/GetBucketCorsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketCorsCommand.ts
rename to clients/client-s3/src/commands/GetBucketCorsCommand.ts
diff --git a/clients/client-s3/commands/GetBucketEncryptionCommand.ts b/clients/client-s3/src/commands/GetBucketEncryptionCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketEncryptionCommand.ts
rename to clients/client-s3/src/commands/GetBucketEncryptionCommand.ts
diff --git a/clients/client-s3/commands/GetBucketIntelligentTieringConfigurationCommand.ts b/clients/client-s3/src/commands/GetBucketIntelligentTieringConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketIntelligentTieringConfigurationCommand.ts
rename to clients/client-s3/src/commands/GetBucketIntelligentTieringConfigurationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketInventoryConfigurationCommand.ts b/clients/client-s3/src/commands/GetBucketInventoryConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketInventoryConfigurationCommand.ts
rename to clients/client-s3/src/commands/GetBucketInventoryConfigurationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketLifecycleConfigurationCommand.ts b/clients/client-s3/src/commands/GetBucketLifecycleConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketLifecycleConfigurationCommand.ts
rename to clients/client-s3/src/commands/GetBucketLifecycleConfigurationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketLocationCommand.ts b/clients/client-s3/src/commands/GetBucketLocationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketLocationCommand.ts
rename to clients/client-s3/src/commands/GetBucketLocationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketLoggingCommand.ts b/clients/client-s3/src/commands/GetBucketLoggingCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketLoggingCommand.ts
rename to clients/client-s3/src/commands/GetBucketLoggingCommand.ts
diff --git a/clients/client-s3/commands/GetBucketMetricsConfigurationCommand.ts b/clients/client-s3/src/commands/GetBucketMetricsConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketMetricsConfigurationCommand.ts
rename to clients/client-s3/src/commands/GetBucketMetricsConfigurationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketNotificationConfigurationCommand.ts b/clients/client-s3/src/commands/GetBucketNotificationConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketNotificationConfigurationCommand.ts
rename to clients/client-s3/src/commands/GetBucketNotificationConfigurationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketOwnershipControlsCommand.ts b/clients/client-s3/src/commands/GetBucketOwnershipControlsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketOwnershipControlsCommand.ts
rename to clients/client-s3/src/commands/GetBucketOwnershipControlsCommand.ts
diff --git a/clients/client-s3/commands/GetBucketPolicyCommand.ts b/clients/client-s3/src/commands/GetBucketPolicyCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketPolicyCommand.ts
rename to clients/client-s3/src/commands/GetBucketPolicyCommand.ts
diff --git a/clients/client-s3/commands/GetBucketPolicyStatusCommand.ts b/clients/client-s3/src/commands/GetBucketPolicyStatusCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketPolicyStatusCommand.ts
rename to clients/client-s3/src/commands/GetBucketPolicyStatusCommand.ts
diff --git a/clients/client-s3/commands/GetBucketReplicationCommand.ts b/clients/client-s3/src/commands/GetBucketReplicationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketReplicationCommand.ts
rename to clients/client-s3/src/commands/GetBucketReplicationCommand.ts
diff --git a/clients/client-s3/commands/GetBucketRequestPaymentCommand.ts b/clients/client-s3/src/commands/GetBucketRequestPaymentCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketRequestPaymentCommand.ts
rename to clients/client-s3/src/commands/GetBucketRequestPaymentCommand.ts
diff --git a/clients/client-s3/commands/GetBucketTaggingCommand.ts b/clients/client-s3/src/commands/GetBucketTaggingCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketTaggingCommand.ts
rename to clients/client-s3/src/commands/GetBucketTaggingCommand.ts
diff --git a/clients/client-s3/commands/GetBucketVersioningCommand.ts b/clients/client-s3/src/commands/GetBucketVersioningCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketVersioningCommand.ts
rename to clients/client-s3/src/commands/GetBucketVersioningCommand.ts
diff --git a/clients/client-s3/commands/GetBucketWebsiteCommand.ts b/clients/client-s3/src/commands/GetBucketWebsiteCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetBucketWebsiteCommand.ts
rename to clients/client-s3/src/commands/GetBucketWebsiteCommand.ts
diff --git a/clients/client-s3/commands/GetObjectAclCommand.ts b/clients/client-s3/src/commands/GetObjectAclCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetObjectAclCommand.ts
rename to clients/client-s3/src/commands/GetObjectAclCommand.ts
diff --git a/clients/client-s3/commands/GetObjectCommand.ts b/clients/client-s3/src/commands/GetObjectCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetObjectCommand.ts
rename to clients/client-s3/src/commands/GetObjectCommand.ts
diff --git a/clients/client-s3/commands/GetObjectLegalHoldCommand.ts b/clients/client-s3/src/commands/GetObjectLegalHoldCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetObjectLegalHoldCommand.ts
rename to clients/client-s3/src/commands/GetObjectLegalHoldCommand.ts
diff --git a/clients/client-s3/commands/GetObjectLockConfigurationCommand.ts b/clients/client-s3/src/commands/GetObjectLockConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetObjectLockConfigurationCommand.ts
rename to clients/client-s3/src/commands/GetObjectLockConfigurationCommand.ts
diff --git a/clients/client-s3/commands/GetObjectRetentionCommand.ts b/clients/client-s3/src/commands/GetObjectRetentionCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetObjectRetentionCommand.ts
rename to clients/client-s3/src/commands/GetObjectRetentionCommand.ts
diff --git a/clients/client-s3/commands/GetObjectTaggingCommand.ts b/clients/client-s3/src/commands/GetObjectTaggingCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetObjectTaggingCommand.ts
rename to clients/client-s3/src/commands/GetObjectTaggingCommand.ts
diff --git a/clients/client-s3/commands/GetObjectTorrentCommand.ts b/clients/client-s3/src/commands/GetObjectTorrentCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetObjectTorrentCommand.ts
rename to clients/client-s3/src/commands/GetObjectTorrentCommand.ts
diff --git a/clients/client-s3/commands/GetPublicAccessBlockCommand.ts b/clients/client-s3/src/commands/GetPublicAccessBlockCommand.ts
similarity index 100%
rename from clients/client-s3/commands/GetPublicAccessBlockCommand.ts
rename to clients/client-s3/src/commands/GetPublicAccessBlockCommand.ts
diff --git a/clients/client-s3/commands/HeadBucketCommand.ts b/clients/client-s3/src/commands/HeadBucketCommand.ts
similarity index 100%
rename from clients/client-s3/commands/HeadBucketCommand.ts
rename to clients/client-s3/src/commands/HeadBucketCommand.ts
diff --git a/clients/client-s3/commands/HeadObjectCommand.ts b/clients/client-s3/src/commands/HeadObjectCommand.ts
similarity index 100%
rename from clients/client-s3/commands/HeadObjectCommand.ts
rename to clients/client-s3/src/commands/HeadObjectCommand.ts
diff --git a/clients/client-s3/commands/ListBucketAnalyticsConfigurationsCommand.ts b/clients/client-s3/src/commands/ListBucketAnalyticsConfigurationsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListBucketAnalyticsConfigurationsCommand.ts
rename to clients/client-s3/src/commands/ListBucketAnalyticsConfigurationsCommand.ts
diff --git a/clients/client-s3/commands/ListBucketIntelligentTieringConfigurationsCommand.ts b/clients/client-s3/src/commands/ListBucketIntelligentTieringConfigurationsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListBucketIntelligentTieringConfigurationsCommand.ts
rename to clients/client-s3/src/commands/ListBucketIntelligentTieringConfigurationsCommand.ts
diff --git a/clients/client-s3/commands/ListBucketInventoryConfigurationsCommand.ts b/clients/client-s3/src/commands/ListBucketInventoryConfigurationsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListBucketInventoryConfigurationsCommand.ts
rename to clients/client-s3/src/commands/ListBucketInventoryConfigurationsCommand.ts
diff --git a/clients/client-s3/commands/ListBucketMetricsConfigurationsCommand.ts b/clients/client-s3/src/commands/ListBucketMetricsConfigurationsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListBucketMetricsConfigurationsCommand.ts
rename to clients/client-s3/src/commands/ListBucketMetricsConfigurationsCommand.ts
diff --git a/clients/client-s3/commands/ListBucketsCommand.ts b/clients/client-s3/src/commands/ListBucketsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListBucketsCommand.ts
rename to clients/client-s3/src/commands/ListBucketsCommand.ts
diff --git a/clients/client-s3/commands/ListMultipartUploadsCommand.ts b/clients/client-s3/src/commands/ListMultipartUploadsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListMultipartUploadsCommand.ts
rename to clients/client-s3/src/commands/ListMultipartUploadsCommand.ts
diff --git a/clients/client-s3/commands/ListObjectVersionsCommand.ts b/clients/client-s3/src/commands/ListObjectVersionsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListObjectVersionsCommand.ts
rename to clients/client-s3/src/commands/ListObjectVersionsCommand.ts
diff --git a/clients/client-s3/commands/ListObjectsCommand.ts b/clients/client-s3/src/commands/ListObjectsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListObjectsCommand.ts
rename to clients/client-s3/src/commands/ListObjectsCommand.ts
diff --git a/clients/client-s3/commands/ListObjectsV2Command.ts b/clients/client-s3/src/commands/ListObjectsV2Command.ts
similarity index 100%
rename from clients/client-s3/commands/ListObjectsV2Command.ts
rename to clients/client-s3/src/commands/ListObjectsV2Command.ts
diff --git a/clients/client-s3/commands/ListPartsCommand.ts b/clients/client-s3/src/commands/ListPartsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/ListPartsCommand.ts
rename to clients/client-s3/src/commands/ListPartsCommand.ts
diff --git a/clients/client-s3/commands/PutBucketAccelerateConfigurationCommand.ts b/clients/client-s3/src/commands/PutBucketAccelerateConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketAccelerateConfigurationCommand.ts
rename to clients/client-s3/src/commands/PutBucketAccelerateConfigurationCommand.ts
diff --git a/clients/client-s3/commands/PutBucketAclCommand.ts b/clients/client-s3/src/commands/PutBucketAclCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketAclCommand.ts
rename to clients/client-s3/src/commands/PutBucketAclCommand.ts
diff --git a/clients/client-s3/commands/PutBucketAnalyticsConfigurationCommand.ts b/clients/client-s3/src/commands/PutBucketAnalyticsConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketAnalyticsConfigurationCommand.ts
rename to clients/client-s3/src/commands/PutBucketAnalyticsConfigurationCommand.ts
diff --git a/clients/client-s3/commands/PutBucketCorsCommand.ts b/clients/client-s3/src/commands/PutBucketCorsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketCorsCommand.ts
rename to clients/client-s3/src/commands/PutBucketCorsCommand.ts
diff --git a/clients/client-s3/commands/PutBucketEncryptionCommand.ts b/clients/client-s3/src/commands/PutBucketEncryptionCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketEncryptionCommand.ts
rename to clients/client-s3/src/commands/PutBucketEncryptionCommand.ts
diff --git a/clients/client-s3/commands/PutBucketIntelligentTieringConfigurationCommand.ts b/clients/client-s3/src/commands/PutBucketIntelligentTieringConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketIntelligentTieringConfigurationCommand.ts
rename to clients/client-s3/src/commands/PutBucketIntelligentTieringConfigurationCommand.ts
diff --git a/clients/client-s3/commands/PutBucketInventoryConfigurationCommand.ts b/clients/client-s3/src/commands/PutBucketInventoryConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketInventoryConfigurationCommand.ts
rename to clients/client-s3/src/commands/PutBucketInventoryConfigurationCommand.ts
diff --git a/clients/client-s3/commands/PutBucketLifecycleConfigurationCommand.ts b/clients/client-s3/src/commands/PutBucketLifecycleConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketLifecycleConfigurationCommand.ts
rename to clients/client-s3/src/commands/PutBucketLifecycleConfigurationCommand.ts
diff --git a/clients/client-s3/commands/PutBucketLoggingCommand.ts b/clients/client-s3/src/commands/PutBucketLoggingCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketLoggingCommand.ts
rename to clients/client-s3/src/commands/PutBucketLoggingCommand.ts
diff --git a/clients/client-s3/commands/PutBucketMetricsConfigurationCommand.ts b/clients/client-s3/src/commands/PutBucketMetricsConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketMetricsConfigurationCommand.ts
rename to clients/client-s3/src/commands/PutBucketMetricsConfigurationCommand.ts
diff --git a/clients/client-s3/commands/PutBucketNotificationConfigurationCommand.ts b/clients/client-s3/src/commands/PutBucketNotificationConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketNotificationConfigurationCommand.ts
rename to clients/client-s3/src/commands/PutBucketNotificationConfigurationCommand.ts
diff --git a/clients/client-s3/commands/PutBucketOwnershipControlsCommand.ts b/clients/client-s3/src/commands/PutBucketOwnershipControlsCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketOwnershipControlsCommand.ts
rename to clients/client-s3/src/commands/PutBucketOwnershipControlsCommand.ts
diff --git a/clients/client-s3/commands/PutBucketPolicyCommand.ts b/clients/client-s3/src/commands/PutBucketPolicyCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketPolicyCommand.ts
rename to clients/client-s3/src/commands/PutBucketPolicyCommand.ts
diff --git a/clients/client-s3/commands/PutBucketReplicationCommand.ts b/clients/client-s3/src/commands/PutBucketReplicationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketReplicationCommand.ts
rename to clients/client-s3/src/commands/PutBucketReplicationCommand.ts
diff --git a/clients/client-s3/commands/PutBucketRequestPaymentCommand.ts b/clients/client-s3/src/commands/PutBucketRequestPaymentCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketRequestPaymentCommand.ts
rename to clients/client-s3/src/commands/PutBucketRequestPaymentCommand.ts
diff --git a/clients/client-s3/commands/PutBucketTaggingCommand.ts b/clients/client-s3/src/commands/PutBucketTaggingCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketTaggingCommand.ts
rename to clients/client-s3/src/commands/PutBucketTaggingCommand.ts
diff --git a/clients/client-s3/commands/PutBucketVersioningCommand.ts b/clients/client-s3/src/commands/PutBucketVersioningCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketVersioningCommand.ts
rename to clients/client-s3/src/commands/PutBucketVersioningCommand.ts
diff --git a/clients/client-s3/commands/PutBucketWebsiteCommand.ts b/clients/client-s3/src/commands/PutBucketWebsiteCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutBucketWebsiteCommand.ts
rename to clients/client-s3/src/commands/PutBucketWebsiteCommand.ts
diff --git a/clients/client-s3/commands/PutObjectAclCommand.ts b/clients/client-s3/src/commands/PutObjectAclCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutObjectAclCommand.ts
rename to clients/client-s3/src/commands/PutObjectAclCommand.ts
diff --git a/clients/client-s3/commands/PutObjectCommand.ts b/clients/client-s3/src/commands/PutObjectCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutObjectCommand.ts
rename to clients/client-s3/src/commands/PutObjectCommand.ts
diff --git a/clients/client-s3/commands/PutObjectLegalHoldCommand.ts b/clients/client-s3/src/commands/PutObjectLegalHoldCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutObjectLegalHoldCommand.ts
rename to clients/client-s3/src/commands/PutObjectLegalHoldCommand.ts
diff --git a/clients/client-s3/commands/PutObjectLockConfigurationCommand.ts b/clients/client-s3/src/commands/PutObjectLockConfigurationCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutObjectLockConfigurationCommand.ts
rename to clients/client-s3/src/commands/PutObjectLockConfigurationCommand.ts
diff --git a/clients/client-s3/commands/PutObjectRetentionCommand.ts b/clients/client-s3/src/commands/PutObjectRetentionCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutObjectRetentionCommand.ts
rename to clients/client-s3/src/commands/PutObjectRetentionCommand.ts
diff --git a/clients/client-s3/commands/PutObjectTaggingCommand.ts b/clients/client-s3/src/commands/PutObjectTaggingCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutObjectTaggingCommand.ts
rename to clients/client-s3/src/commands/PutObjectTaggingCommand.ts
diff --git a/clients/client-s3/commands/PutPublicAccessBlockCommand.ts b/clients/client-s3/src/commands/PutPublicAccessBlockCommand.ts
similarity index 100%
rename from clients/client-s3/commands/PutPublicAccessBlockCommand.ts
rename to clients/client-s3/src/commands/PutPublicAccessBlockCommand.ts
diff --git a/clients/client-s3/commands/RestoreObjectCommand.ts b/clients/client-s3/src/commands/RestoreObjectCommand.ts
similarity index 100%
rename from clients/client-s3/commands/RestoreObjectCommand.ts
rename to clients/client-s3/src/commands/RestoreObjectCommand.ts
diff --git a/clients/client-s3/commands/SelectObjectContentCommand.ts b/clients/client-s3/src/commands/SelectObjectContentCommand.ts
similarity index 100%
rename from clients/client-s3/commands/SelectObjectContentCommand.ts
rename to clients/client-s3/src/commands/SelectObjectContentCommand.ts
diff --git a/clients/client-s3/commands/UploadPartCommand.ts b/clients/client-s3/src/commands/UploadPartCommand.ts
similarity index 100%
rename from clients/client-s3/commands/UploadPartCommand.ts
rename to clients/client-s3/src/commands/UploadPartCommand.ts
diff --git a/clients/client-s3/commands/UploadPartCopyCommand.ts b/clients/client-s3/src/commands/UploadPartCopyCommand.ts
similarity index 100%
rename from clients/client-s3/commands/UploadPartCopyCommand.ts
rename to clients/client-s3/src/commands/UploadPartCopyCommand.ts
diff --git a/clients/client-s3/commands/WriteGetObjectResponseCommand.ts b/clients/client-s3/src/commands/WriteGetObjectResponseCommand.ts
similarity index 100%
rename from clients/client-s3/commands/WriteGetObjectResponseCommand.ts
rename to clients/client-s3/src/commands/WriteGetObjectResponseCommand.ts
diff --git a/clients/client-s3/endpoints.ts b/clients/client-s3/src/endpoints.ts
similarity index 100%
rename from clients/client-s3/endpoints.ts
rename to clients/client-s3/src/endpoints.ts
diff --git a/clients/client-s3/index.ts b/clients/client-s3/src/index.ts
similarity index 100%
rename from clients/client-s3/index.ts
rename to clients/client-s3/src/index.ts
diff --git a/clients/client-s3/models/index.ts b/clients/client-s3/src/models/index.ts
similarity index 100%
rename from clients/client-s3/models/index.ts
rename to clients/client-s3/src/models/index.ts
diff --git a/clients/client-s3/models/models_0.ts b/clients/client-s3/src/models/models_0.ts
similarity index 100%
rename from clients/client-s3/models/models_0.ts
rename to clients/client-s3/src/models/models_0.ts
diff --git a/clients/client-s3/models/models_1.ts b/clients/client-s3/src/models/models_1.ts
similarity index 100%
rename from clients/client-s3/models/models_1.ts
rename to clients/client-s3/src/models/models_1.ts
diff --git a/clients/client-s3/pagination/Interfaces.ts b/clients/client-s3/src/pagination/Interfaces.ts
similarity index 100%
rename from clients/client-s3/pagination/Interfaces.ts
rename to clients/client-s3/src/pagination/Interfaces.ts
diff --git a/clients/client-s3/pagination/ListObjectsV2Paginator.ts b/clients/client-s3/src/pagination/ListObjectsV2Paginator.ts
similarity index 100%
rename from clients/client-s3/pagination/ListObjectsV2Paginator.ts
rename to clients/client-s3/src/pagination/ListObjectsV2Paginator.ts
diff --git a/clients/client-s3/pagination/ListPartsPaginator.ts b/clients/client-s3/src/pagination/ListPartsPaginator.ts
similarity index 100%
rename from clients/client-s3/pagination/ListPartsPaginator.ts
rename to clients/client-s3/src/pagination/ListPartsPaginator.ts
diff --git a/clients/client-s3/protocols/Aws_restXml.ts b/clients/client-s3/src/protocols/Aws_restXml.ts
similarity index 100%
rename from clients/client-s3/protocols/Aws_restXml.ts
rename to clients/client-s3/src/protocols/Aws_restXml.ts
diff --git a/clients/client-s3/runtimeConfig.browser.ts b/clients/client-s3/src/runtimeConfig.browser.ts
similarity index 95%
rename from clients/client-s3/runtimeConfig.browser.ts
rename to clients/client-s3/src/runtimeConfig.browser.ts
index f1221b4..f613882 100644
--- a/clients/client-s3/runtimeConfig.browser.ts
+++ b/clients/client-s3/src/runtimeConfig.browser.ts
@@ -1,4 +1,5 @@
-import packageInfo from "./package.json";
+// @ts-ignore: package.json will be imported from dist folders
+import packageInfo from "../package.json";
 
 import { Sha256 } from "@aws-crypto/sha256-browser";
 import { eventStreamSerdeProvider } from "@aws-sdk/eventstream-serde-browser";
diff --git a/clients/client-s3/runtimeConfig.native.ts b/clients/client-s3/src/runtimeConfig.native.ts
similarity index 100%
rename from clients/client-s3/runtimeConfig.native.ts
rename to clients/client-s3/src/runtimeConfig.native.ts
diff --git a/clients/client-s3/runtimeConfig.shared.ts b/clients/client-s3/src/runtimeConfig.shared.ts
similarity index 100%
rename from clients/client-s3/runtimeConfig.shared.ts
rename to clients/client-s3/src/runtimeConfig.shared.ts
diff --git a/clients/client-s3/runtimeConfig.ts b/clients/client-s3/src/runtimeConfig.ts
similarity index 96%
rename from clients/client-s3/runtimeConfig.ts
rename to clients/client-s3/src/runtimeConfig.ts
index 891e3a6..a1074e6 100644
--- a/clients/client-s3/runtimeConfig.ts
+++ b/clients/client-s3/src/runtimeConfig.ts
@@ -1,4 +1,5 @@
-import packageInfo from "./package.json";
+// @ts-ignore: package.json will be imported from dist folders
+import packageInfo from "../package.json";
 
 import { decorateDefaultCredentialProvider } from "@aws-sdk/client-sts";
 import { NODE_REGION_CONFIG_FILE_OPTIONS, NODE_REGION_CONFIG_OPTIONS } from "@aws-sdk/config-resolver";
diff --git a/clients/client-s3/waiters/waitForBucketExists.ts b/clients/client-s3/src/waiters/waitForBucketExists.ts
similarity index 100%
rename from clients/client-s3/waiters/waitForBucketExists.ts
rename to clients/client-s3/src/waiters/waitForBucketExists.ts
diff --git a/clients/client-s3/waiters/waitForBucketNotExists.ts b/clients/client-s3/src/waiters/waitForBucketNotExists.ts
similarity index 100%
rename from clients/client-s3/waiters/waitForBucketNotExists.ts
rename to clients/client-s3/src/waiters/waitForBucketNotExists.ts
diff --git a/clients/client-s3/waiters/waitForObjectExists.ts b/clients/client-s3/src/waiters/waitForObjectExists.ts
similarity index 100%
rename from clients/client-s3/waiters/waitForObjectExists.ts
rename to clients/client-s3/src/waiters/waitForObjectExists.ts
diff --git a/clients/client-s3/waiters/waitForObjectNotExists.ts b/clients/client-s3/src/waiters/waitForObjectNotExists.ts
similarity index 100%
rename from clients/client-s3/waiters/waitForObjectNotExists.ts
rename to clients/client-s3/src/waiters/waitForObjectNotExists.ts
diff --git a/clients/client-s3/e2e/README.md b/clients/client-s3/test/e2e/README.md
similarity index 100%
rename from clients/client-s3/e2e/README.md
rename to clients/client-s3/test/e2e/README.md
diff --git a/clients/client-s3/e2e/S3.ispec.ts b/clients/client-s3/test/e2e/S3.ispec.ts
similarity index 99%
rename from clients/client-s3/e2e/S3.ispec.ts
rename to clients/client-s3/test/e2e/S3.ispec.ts
index 2322406..2836a29 100644
--- a/clients/client-s3/e2e/S3.ispec.ts
+++ b/clients/client-s3/test/e2e/S3.ispec.ts
@@ -5,7 +5,7 @@
  */
 import chai from "chai";
 import chaiAsPromised from "chai-as-promised";
-import { S3 } from "../index";
+import { S3 } from "../../src/index";
 import { Credentials } from "@aws-sdk/types";
 import { createBuffer } from "./helpers";
 chai.use(chaiAsPromised);
diff --git a/clients/client-s3/e2e/helpers.ts b/clients/client-s3/test/e2e/helpers.ts
similarity index 100%
rename from clients/client-s3/e2e/helpers.ts
rename to clients/client-s3/test/e2e/helpers.ts
diff --git a/clients/client-s3/tsconfig.es.json b/clients/client-s3/tsconfig.es.json
index 30df5d2..d67a49e 100644
--- a/clients/client-s3/tsconfig.es.json
+++ b/clients/client-s3/tsconfig.es.json
@@ -4,9 +4,9 @@
     "target": "es5",
     "module": "esnext",
     "moduleResolution": "node",
-    "declaration": false,
-    "declarationDir": null,
+    "declaration": true,
+    "declarationDir": "dist-types",
     "lib": ["dom", "es5", "es2015.promise", "es2015.collection", "es2015.iterable", "es2015.symbol.wellknown"],
-    "outDir": "dist/es"
+    "outDir": "dist-es"
   }
 }
diff --git a/clients/client-s3/tsconfig.json b/clients/client-s3/tsconfig.json
index 71a8ab4..cd54095 100644
--- a/clients/client-s3/tsconfig.json
+++ b/clients/client-s3/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
+    "rootDir": "./src",
     "alwaysStrict": true,
     "target": "ES2018",
     "module": "commonjs",
-    "declaration": true,
     "strict": true,
     "sourceMap": true,
     "downlevelIteration": true,
@@ -12,8 +12,7 @@
     "incremental": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "declarationDir": "./dist/types",
-    "outDir": "dist/cjs",
+    "outDir": "dist-cjs",
     "types": ["mocha", "node"]
   },
   "typedocOptions": {
@@ -29,5 +28,6 @@
     "out": "./docs",
     "theme": "minimal",
     "plugin": ["@aws-sdk/client-documentation-generator"]
-  }
+  },
+  "exclude": ["test/**/*", "src/**/*.spec.ts"]
 }