diff --git a/clients/acm.js b/clients/acm.js
index 4d379a102a..15a94773ff 100644
--- a/clients/acm.js
+++ b/clients/acm.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ACM')) {
   apiLoader.services['acm'] = {};
   AWS.ACM = Service.defineService('acm', ['2015-12-08']);
 
-  apiLoader.services['acm']['2015-12-08'] = require('../apis/acm-2015-12-08.min');
-  apiLoader.services['acm']['2015-12-08'].paginators = require('../apis/acm-2015-12-08.paginators').pagination;
+  apiLoader.services['acm']['2015-12-08'] = require('../apis/acm-2015-12-08.min.json');
+  apiLoader.services['acm']['2015-12-08'].paginators = require('../apis/acm-2015-12-08.paginators.json').pagination;
 }
 
 module.exports = AWS.ACM;
diff --git a/clients/apigateway.js b/clients/apigateway.js
index baae574364..bd803b4fb1 100644
--- a/clients/apigateway.js
+++ b/clients/apigateway.js
@@ -8,8 +8,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'APIGateway')) {
   AWS.APIGateway = Service.defineService('apigateway', ['2015-07-09']);
   require('../lib/services/apigateway');
 
-  apiLoader.services['apigateway']['2015-07-09'] = require('../apis/apigateway-2015-07-09.min');
-  apiLoader.services['apigateway']['2015-07-09'].paginators = require('../apis/apigateway-2015-07-09.paginators').pagination;
+  apiLoader.services['apigateway']['2015-07-09'] = require('../apis/apigateway-2015-07-09.min.json');
+  apiLoader.services['apigateway']['2015-07-09'].paginators = require('../apis/apigateway-2015-07-09.paginators.json').pagination;
 }
 
 module.exports = AWS.APIGateway;
diff --git a/clients/applicationautoscaling.js b/clients/applicationautoscaling.js
index ef4c84ae98..86a3746f4b 100644
--- a/clients/applicationautoscaling.js
+++ b/clients/applicationautoscaling.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ApplicationAutoScaling')) {
   apiLoader.services['applicationautoscaling'] = {};
   AWS.ApplicationAutoScaling = Service.defineService('applicationautoscaling', ['2016-02-06']);
 
-  apiLoader.services['applicationautoscaling']['2016-02-06'] = require('../apis/application-autoscaling-2016-02-06.min');
-  apiLoader.services['applicationautoscaling']['2016-02-06'].paginators = require('../apis/application-autoscaling-2016-02-06.paginators').pagination;
+  apiLoader.services['applicationautoscaling']['2016-02-06'] = require('../apis/application-autoscaling-2016-02-06.min.json');
+  apiLoader.services['applicationautoscaling']['2016-02-06'].paginators = require('../apis/application-autoscaling-2016-02-06.paginators.json').pagination;
 }
 
 module.exports = AWS.ApplicationAutoScaling;
diff --git a/clients/autoscaling.js b/clients/autoscaling.js
index 558d613f00..ad885b3ade 100644
--- a/clients/autoscaling.js
+++ b/clients/autoscaling.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'AutoScaling')) {
   apiLoader.services['autoscaling'] = {};
   AWS.AutoScaling = Service.defineService('autoscaling', ['2011-01-01']);
 
-  apiLoader.services['autoscaling']['2011-01-01'] = require('../apis/autoscaling-2011-01-01.min');
-  apiLoader.services['autoscaling']['2011-01-01'].paginators = require('../apis/autoscaling-2011-01-01.paginators').pagination;
+  apiLoader.services['autoscaling']['2011-01-01'] = require('../apis/autoscaling-2011-01-01.min.json');
+  apiLoader.services['autoscaling']['2011-01-01'].paginators = require('../apis/autoscaling-2011-01-01.paginators.json').pagination;
 }
 
 module.exports = AWS.AutoScaling;
diff --git a/clients/cloudformation.js b/clients/cloudformation.js
index 5b53256e95..0c2df538a8 100644
--- a/clients/cloudformation.js
+++ b/clients/cloudformation.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudFormation')) {
   apiLoader.services['cloudformation'] = {};
   AWS.CloudFormation = Service.defineService('cloudformation', ['2010-05-15']);
 
-  apiLoader.services['cloudformation']['2010-05-15'] = require('../apis/cloudformation-2010-05-15.min');
-  apiLoader.services['cloudformation']['2010-05-15'].paginators = require('../apis/cloudformation-2010-05-15.paginators').pagination;
-  apiLoader.services['cloudformation']['2010-05-15'].waiters = require('../apis/cloudformation-2010-05-15.waiters2').waiters;
+  apiLoader.services['cloudformation']['2010-05-15'] = require('../apis/cloudformation-2010-05-15.min.json');
+  apiLoader.services['cloudformation']['2010-05-15'].paginators = require('../apis/cloudformation-2010-05-15.paginators.json').pagination;
+  apiLoader.services['cloudformation']['2010-05-15'].waiters = require('../apis/cloudformation-2010-05-15.waiters2.json').waiters;
 }
 
 module.exports = AWS.CloudFormation;
diff --git a/clients/cloudfront.js b/clients/cloudfront.js
index c6b3fccd6a..dfcba9f9c2 100644
--- a/clients/cloudfront.js
+++ b/clients/cloudfront.js
@@ -8,9 +8,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudFront')) {
   AWS.CloudFront = Service.defineService('cloudfront', ['2016-08-20']);
   require('../lib/services/cloudfront');
 
-  apiLoader.services['cloudfront']['2016-08-20'] = require('../apis/cloudfront-2016-08-20.min');
-  apiLoader.services['cloudfront']['2016-08-20'].paginators = require('../apis/cloudfront-2016-08-20.paginators').pagination;
-  apiLoader.services['cloudfront']['2016-08-20'].waiters = require('../apis/cloudfront-2016-08-20.waiters2').waiters;
+  apiLoader.services['cloudfront']['2016-08-20'] = require('../apis/cloudfront-2016-08-20.min.json');
+  apiLoader.services['cloudfront']['2016-08-20'].paginators = require('../apis/cloudfront-2016-08-20.paginators.json').pagination;
+  apiLoader.services['cloudfront']['2016-08-20'].waiters = require('../apis/cloudfront-2016-08-20.waiters2.json').waiters;
 }
 
 module.exports = AWS.CloudFront;
diff --git a/clients/cloudhsm.js b/clients/cloudhsm.js
index d09fa7d00f..51154fd943 100644
--- a/clients/cloudhsm.js
+++ b/clients/cloudhsm.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudHSM')) {
   apiLoader.services['cloudhsm'] = {};
   AWS.CloudHSM = Service.defineService('cloudhsm', ['2014-05-30']);
 
-  apiLoader.services['cloudhsm']['2014-05-30'] = require('../apis/cloudhsm-2014-05-30.min');
+  apiLoader.services['cloudhsm']['2014-05-30'] = require('../apis/cloudhsm-2014-05-30.min.json');
 }
 
 module.exports = AWS.CloudHSM;
diff --git a/clients/cloudsearch.js b/clients/cloudsearch.js
index 0d7d295189..15632530c8 100644
--- a/clients/cloudsearch.js
+++ b/clients/cloudsearch.js
@@ -7,11 +7,11 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudSearch')) {
   apiLoader.services['cloudsearch'] = {};
   AWS.CloudSearch = Service.defineService('cloudsearch', ['2011-02-01', '2013-01-01']);
 
-  apiLoader.services['cloudsearch']['2011-02-01'] = require('../apis/cloudsearch-2011-02-01.min');
-  apiLoader.services['cloudsearch']['2011-02-01'].paginators = require('../apis/cloudsearch-2011-02-01.paginators').pagination;
+  apiLoader.services['cloudsearch']['2011-02-01'] = require('../apis/cloudsearch-2011-02-01.min.json');
+  apiLoader.services['cloudsearch']['2011-02-01'].paginators = require('../apis/cloudsearch-2011-02-01.paginators.json').pagination;
 
-  apiLoader.services['cloudsearch']['2013-01-01'] = require('../apis/cloudsearch-2013-01-01.min');
-  apiLoader.services['cloudsearch']['2013-01-01'].paginators = require('../apis/cloudsearch-2013-01-01.paginators').pagination;
+  apiLoader.services['cloudsearch']['2013-01-01'] = require('../apis/cloudsearch-2013-01-01.min.json');
+  apiLoader.services['cloudsearch']['2013-01-01'].paginators = require('../apis/cloudsearch-2013-01-01.paginators.json').pagination;
 }
 
 module.exports = AWS.CloudSearch;
diff --git a/clients/cloudsearchdomain.js b/clients/cloudsearchdomain.js
index 2f58beae4b..e931656dca 100644
--- a/clients/cloudsearchdomain.js
+++ b/clients/cloudsearchdomain.js
@@ -8,7 +8,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudSearchDomain')) {
   AWS.CloudSearchDomain = Service.defineService('cloudsearchdomain', ['2013-01-01']);
   require('../lib/services/cloudsearchdomain');
 
-  apiLoader.services['cloudsearchdomain']['2013-01-01'] = require('../apis/cloudsearchdomain-2013-01-01.min');
+  apiLoader.services['cloudsearchdomain']['2013-01-01'] = require('../apis/cloudsearchdomain-2013-01-01.min.json');
 }
 
 module.exports = AWS.CloudSearchDomain;
diff --git a/clients/cloudtrail.js b/clients/cloudtrail.js
index 98c5804d04..97d93e5afe 100644
--- a/clients/cloudtrail.js
+++ b/clients/cloudtrail.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudTrail')) {
   apiLoader.services['cloudtrail'] = {};
   AWS.CloudTrail = Service.defineService('cloudtrail', ['2013-11-01']);
 
-  apiLoader.services['cloudtrail']['2013-11-01'] = require('../apis/cloudtrail-2013-11-01.min');
-  apiLoader.services['cloudtrail']['2013-11-01'].paginators = require('../apis/cloudtrail-2013-11-01.paginators').pagination;
+  apiLoader.services['cloudtrail']['2013-11-01'] = require('../apis/cloudtrail-2013-11-01.min.json');
+  apiLoader.services['cloudtrail']['2013-11-01'].paginators = require('../apis/cloudtrail-2013-11-01.paginators.json').pagination;
 }
 
 module.exports = AWS.CloudTrail;
diff --git a/clients/cloudwatch.js b/clients/cloudwatch.js
index 8e527eec34..883f2a869e 100644
--- a/clients/cloudwatch.js
+++ b/clients/cloudwatch.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudWatch')) {
   apiLoader.services['cloudwatch'] = {};
   AWS.CloudWatch = Service.defineService('cloudwatch', ['2010-08-01']);
 
-  apiLoader.services['cloudwatch']['2010-08-01'] = require('../apis/monitoring-2010-08-01.min');
-  apiLoader.services['cloudwatch']['2010-08-01'].paginators = require('../apis/monitoring-2010-08-01.paginators').pagination;
-  apiLoader.services['cloudwatch']['2010-08-01'].waiters = require('../apis/monitoring-2010-08-01.waiters2').waiters;
+  apiLoader.services['cloudwatch']['2010-08-01'] = require('../apis/monitoring-2010-08-01.min.json');
+  apiLoader.services['cloudwatch']['2010-08-01'].paginators = require('../apis/monitoring-2010-08-01.paginators.json').pagination;
+  apiLoader.services['cloudwatch']['2010-08-01'].waiters = require('../apis/monitoring-2010-08-01.waiters2.json').waiters;
 }
 
 module.exports = AWS.CloudWatch;
diff --git a/clients/cloudwatchevents.js b/clients/cloudwatchevents.js
index f58babba02..ae42be2437 100644
--- a/clients/cloudwatchevents.js
+++ b/clients/cloudwatchevents.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudWatchEvents')) {
   apiLoader.services['cloudwatchevents'] = {};
   AWS.CloudWatchEvents = Service.defineService('cloudwatchevents', ['2015-10-07']);
 
-  apiLoader.services['cloudwatchevents']['2015-10-07'] = require('../apis/events-2015-10-07.min');
+  apiLoader.services['cloudwatchevents']['2015-10-07'] = require('../apis/events-2015-10-07.min.json');
 }
 
 module.exports = AWS.CloudWatchEvents;
diff --git a/clients/cloudwatchlogs.js b/clients/cloudwatchlogs.js
index a13ba9e837..14c38135d8 100644
--- a/clients/cloudwatchlogs.js
+++ b/clients/cloudwatchlogs.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CloudWatchLogs')) {
   apiLoader.services['cloudwatchlogs'] = {};
   AWS.CloudWatchLogs = Service.defineService('cloudwatchlogs', ['2014-03-28']);
 
-  apiLoader.services['cloudwatchlogs']['2014-03-28'] = require('../apis/logs-2014-03-28.min');
-  apiLoader.services['cloudwatchlogs']['2014-03-28'].paginators = require('../apis/logs-2014-03-28.paginators').pagination;
+  apiLoader.services['cloudwatchlogs']['2014-03-28'] = require('../apis/logs-2014-03-28.min.json');
+  apiLoader.services['cloudwatchlogs']['2014-03-28'].paginators = require('../apis/logs-2014-03-28.paginators.json').pagination;
 }
 
 module.exports = AWS.CloudWatchLogs;
diff --git a/clients/codecommit.js b/clients/codecommit.js
index 9ce0f3d5c6..396b68e663 100644
--- a/clients/codecommit.js
+++ b/clients/codecommit.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CodeCommit')) {
   apiLoader.services['codecommit'] = {};
   AWS.CodeCommit = Service.defineService('codecommit', ['2015-04-13']);
 
-  apiLoader.services['codecommit']['2015-04-13'] = require('../apis/codecommit-2015-04-13.min');
-  apiLoader.services['codecommit']['2015-04-13'].paginators = require('../apis/codecommit-2015-04-13.paginators').pagination;
+  apiLoader.services['codecommit']['2015-04-13'] = require('../apis/codecommit-2015-04-13.min.json');
+  apiLoader.services['codecommit']['2015-04-13'].paginators = require('../apis/codecommit-2015-04-13.paginators.json').pagination;
 }
 
 module.exports = AWS.CodeCommit;
diff --git a/clients/codedeploy.js b/clients/codedeploy.js
index e6ec02bd19..6d246f2c5e 100644
--- a/clients/codedeploy.js
+++ b/clients/codedeploy.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CodeDeploy')) {
   apiLoader.services['codedeploy'] = {};
   AWS.CodeDeploy = Service.defineService('codedeploy', ['2014-10-06']);
 
-  apiLoader.services['codedeploy']['2014-10-06'] = require('../apis/codedeploy-2014-10-06.min');
-  apiLoader.services['codedeploy']['2014-10-06'].paginators = require('../apis/codedeploy-2014-10-06.paginators').pagination;
-  apiLoader.services['codedeploy']['2014-10-06'].waiters = require('../apis/codedeploy-2014-10-06.waiters2').waiters;
+  apiLoader.services['codedeploy']['2014-10-06'] = require('../apis/codedeploy-2014-10-06.min.json');
+  apiLoader.services['codedeploy']['2014-10-06'].paginators = require('../apis/codedeploy-2014-10-06.paginators.json').pagination;
+  apiLoader.services['codedeploy']['2014-10-06'].waiters = require('../apis/codedeploy-2014-10-06.waiters2.json').waiters;
 }
 
 module.exports = AWS.CodeDeploy;
diff --git a/clients/codepipeline.js b/clients/codepipeline.js
index f8b7597c77..2897a1f359 100644
--- a/clients/codepipeline.js
+++ b/clients/codepipeline.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CodePipeline')) {
   apiLoader.services['codepipeline'] = {};
   AWS.CodePipeline = Service.defineService('codepipeline', ['2015-07-09']);
 
-  apiLoader.services['codepipeline']['2015-07-09'] = require('../apis/codepipeline-2015-07-09.min');
+  apiLoader.services['codepipeline']['2015-07-09'] = require('../apis/codepipeline-2015-07-09.min.json');
 }
 
 module.exports = AWS.CodePipeline;
diff --git a/clients/cognitoidentity.js b/clients/cognitoidentity.js
index 3064f821b2..989e72bb35 100644
--- a/clients/cognitoidentity.js
+++ b/clients/cognitoidentity.js
@@ -8,7 +8,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CognitoIdentity')) {
   AWS.CognitoIdentity = Service.defineService('cognitoidentity', ['2014-06-30']);
   require('../lib/services/cognitoidentity');
 
-  apiLoader.services['cognitoidentity']['2014-06-30'] = require('../apis/cognito-identity-2014-06-30.min');
+  apiLoader.services['cognitoidentity']['2014-06-30'] = require('../apis/cognito-identity-2014-06-30.min.json');
 }
 
 module.exports = AWS.CognitoIdentity;
diff --git a/clients/cognitoidentityserviceprovider.js b/clients/cognitoidentityserviceprovider.js
index fe4158fa34..ab4f030c4d 100644
--- a/clients/cognitoidentityserviceprovider.js
+++ b/clients/cognitoidentityserviceprovider.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CognitoIdentityServiceProvider')
   apiLoader.services['cognitoidentityserviceprovider'] = {};
   AWS.CognitoIdentityServiceProvider = Service.defineService('cognitoidentityserviceprovider', ['2016-04-18']);
 
-  apiLoader.services['cognitoidentityserviceprovider']['2016-04-18'] = require('../apis/cognito-idp-2016-04-18.min');
+  apiLoader.services['cognitoidentityserviceprovider']['2016-04-18'] = require('../apis/cognito-idp-2016-04-18.min.json');
 }
 
 module.exports = AWS.CognitoIdentityServiceProvider;
diff --git a/clients/cognitosync.js b/clients/cognitosync.js
index de2269e7e2..273b3a5b12 100644
--- a/clients/cognitosync.js
+++ b/clients/cognitosync.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'CognitoSync')) {
   apiLoader.services['cognitosync'] = {};
   AWS.CognitoSync = Service.defineService('cognitosync', ['2014-06-30']);
 
-  apiLoader.services['cognitosync']['2014-06-30'] = require('../apis/cognito-sync-2014-06-30.min');
+  apiLoader.services['cognitosync']['2014-06-30'] = require('../apis/cognito-sync-2014-06-30.min.json');
 }
 
 module.exports = AWS.CognitoSync;
diff --git a/clients/configservice.js b/clients/configservice.js
index 5f1ca8681f..7a048b5125 100644
--- a/clients/configservice.js
+++ b/clients/configservice.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ConfigService')) {
   apiLoader.services['configservice'] = {};
   AWS.ConfigService = Service.defineService('configservice', ['2014-11-12']);
 
-  apiLoader.services['configservice']['2014-11-12'] = require('../apis/config-2014-11-12.min');
-  apiLoader.services['configservice']['2014-11-12'].paginators = require('../apis/config-2014-11-12.paginators').pagination;
+  apiLoader.services['configservice']['2014-11-12'] = require('../apis/config-2014-11-12.min.json');
+  apiLoader.services['configservice']['2014-11-12'].paginators = require('../apis/config-2014-11-12.paginators.json').pagination;
 }
 
 module.exports = AWS.ConfigService;
diff --git a/clients/datapipeline.js b/clients/datapipeline.js
index d9f17b3f75..7dc49bd0cc 100644
--- a/clients/datapipeline.js
+++ b/clients/datapipeline.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'DataPipeline')) {
   apiLoader.services['datapipeline'] = {};
   AWS.DataPipeline = Service.defineService('datapipeline', ['2012-10-29']);
 
-  apiLoader.services['datapipeline']['2012-10-29'] = require('../apis/datapipeline-2012-10-29.min');
-  apiLoader.services['datapipeline']['2012-10-29'].paginators = require('../apis/datapipeline-2012-10-29.paginators').pagination;
+  apiLoader.services['datapipeline']['2012-10-29'] = require('../apis/datapipeline-2012-10-29.min.json');
+  apiLoader.services['datapipeline']['2012-10-29'].paginators = require('../apis/datapipeline-2012-10-29.paginators.json').pagination;
 }
 
 module.exports = AWS.DataPipeline;
diff --git a/clients/devicefarm.js b/clients/devicefarm.js
index efa19cb7ca..44eea36348 100644
--- a/clients/devicefarm.js
+++ b/clients/devicefarm.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'DeviceFarm')) {
   apiLoader.services['devicefarm'] = {};
   AWS.DeviceFarm = Service.defineService('devicefarm', ['2015-06-23']);
 
-  apiLoader.services['devicefarm']['2015-06-23'] = require('../apis/devicefarm-2015-06-23.min');
-  apiLoader.services['devicefarm']['2015-06-23'].paginators = require('../apis/devicefarm-2015-06-23.paginators').pagination;
+  apiLoader.services['devicefarm']['2015-06-23'] = require('../apis/devicefarm-2015-06-23.min.json');
+  apiLoader.services['devicefarm']['2015-06-23'].paginators = require('../apis/devicefarm-2015-06-23.paginators.json').pagination;
 }
 
 module.exports = AWS.DeviceFarm;
diff --git a/clients/directconnect.js b/clients/directconnect.js
index bde45ca0fa..6d81764cdc 100644
--- a/clients/directconnect.js
+++ b/clients/directconnect.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'DirectConnect')) {
   apiLoader.services['directconnect'] = {};
   AWS.DirectConnect = Service.defineService('directconnect', ['2012-10-25']);
 
-  apiLoader.services['directconnect']['2012-10-25'] = require('../apis/directconnect-2012-10-25.min');
-  apiLoader.services['directconnect']['2012-10-25'].paginators = require('../apis/directconnect-2012-10-25.paginators').pagination;
+  apiLoader.services['directconnect']['2012-10-25'] = require('../apis/directconnect-2012-10-25.min.json');
+  apiLoader.services['directconnect']['2012-10-25'].paginators = require('../apis/directconnect-2012-10-25.paginators.json').pagination;
 }
 
 module.exports = AWS.DirectConnect;
diff --git a/clients/directoryservice.js b/clients/directoryservice.js
index fcf8745864..55bc6d798d 100644
--- a/clients/directoryservice.js
+++ b/clients/directoryservice.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'DirectoryService')) {
   apiLoader.services['directoryservice'] = {};
   AWS.DirectoryService = Service.defineService('directoryservice', ['2015-04-16']);
 
-  apiLoader.services['directoryservice']['2015-04-16'] = require('../apis/ds-2015-04-16.min');
+  apiLoader.services['directoryservice']['2015-04-16'] = require('../apis/ds-2015-04-16.min.json');
 }
 
 module.exports = AWS.DirectoryService;
diff --git a/clients/discovery.js b/clients/discovery.js
index 357292e301..8d011491ad 100644
--- a/clients/discovery.js
+++ b/clients/discovery.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Discovery')) {
   apiLoader.services['discovery'] = {};
   AWS.Discovery = Service.defineService('discovery', ['2015-11-01']);
 
-  apiLoader.services['discovery']['2015-11-01'] = require('../apis/discovery-2015-11-01.min');
+  apiLoader.services['discovery']['2015-11-01'] = require('../apis/discovery-2015-11-01.min.json');
 }
 
 module.exports = AWS.Discovery;
diff --git a/clients/dms.js b/clients/dms.js
index aacfcfe5d3..6ef0920ecf 100644
--- a/clients/dms.js
+++ b/clients/dms.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'DMS')) {
   apiLoader.services['dms'] = {};
   AWS.DMS = Service.defineService('dms', ['2016-01-01']);
 
-  apiLoader.services['dms']['2016-01-01'] = require('../apis/dms-2016-01-01.min');
+  apiLoader.services['dms']['2016-01-01'] = require('../apis/dms-2016-01-01.min.json');
 }
 
 module.exports = AWS.DMS;
diff --git a/clients/dynamodb.js b/clients/dynamodb.js
index bc0a0ea47e..545202afb6 100644
--- a/clients/dynamodb.js
+++ b/clients/dynamodb.js
@@ -8,13 +8,13 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'DynamoDB')) {
   AWS.DynamoDB = Service.defineService('dynamodb', ['2011-12-05', '2012-08-10']);
   require('../lib/services/dynamodb');
 
-  apiLoader.services['dynamodb']['2011-12-05'] = require('../apis/dynamodb-2011-12-05.min');
-  apiLoader.services['dynamodb']['2011-12-05'].paginators = require('../apis/dynamodb-2011-12-05.paginators').pagination;
-  apiLoader.services['dynamodb']['2011-12-05'].waiters = require('../apis/dynamodb-2011-12-05.waiters2').waiters;
+  apiLoader.services['dynamodb']['2011-12-05'] = require('../apis/dynamodb-2011-12-05.min.json');
+  apiLoader.services['dynamodb']['2011-12-05'].paginators = require('../apis/dynamodb-2011-12-05.paginators.json').pagination;
+  apiLoader.services['dynamodb']['2011-12-05'].waiters = require('../apis/dynamodb-2011-12-05.waiters2.json').waiters;
 
-  apiLoader.services['dynamodb']['2012-08-10'] = require('../apis/dynamodb-2012-08-10.min');
-  apiLoader.services['dynamodb']['2012-08-10'].paginators = require('../apis/dynamodb-2012-08-10.paginators').pagination;
-  apiLoader.services['dynamodb']['2012-08-10'].waiters = require('../apis/dynamodb-2012-08-10.waiters2').waiters;
+  apiLoader.services['dynamodb']['2012-08-10'] = require('../apis/dynamodb-2012-08-10.min.json');
+  apiLoader.services['dynamodb']['2012-08-10'].paginators = require('../apis/dynamodb-2012-08-10.paginators.json').pagination;
+  apiLoader.services['dynamodb']['2012-08-10'].waiters = require('../apis/dynamodb-2012-08-10.waiters2.json').waiters;
 }
 
 module.exports = AWS.DynamoDB;
diff --git a/clients/dynamodbstreams.js b/clients/dynamodbstreams.js
index 7043c8ce68..ec29516e3d 100644
--- a/clients/dynamodbstreams.js
+++ b/clients/dynamodbstreams.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'DynamoDBStreams')) {
   apiLoader.services['dynamodbstreams'] = {};
   AWS.DynamoDBStreams = Service.defineService('dynamodbstreams', ['2012-08-10']);
 
-  apiLoader.services['dynamodbstreams']['2012-08-10'] = require('../apis/streams.dynamodb-2012-08-10.min');
+  apiLoader.services['dynamodbstreams']['2012-08-10'] = require('../apis/streams.dynamodb-2012-08-10.min.json');
 }
 
 module.exports = AWS.DynamoDBStreams;
diff --git a/clients/ec2.js b/clients/ec2.js
index 85352bc66e..a5112fb276 100644
--- a/clients/ec2.js
+++ b/clients/ec2.js
@@ -8,9 +8,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'EC2')) {
   AWS.EC2 = Service.defineService('ec2', ['2016-04-01']);
   require('../lib/services/ec2');
 
-  apiLoader.services['ec2']['2016-04-01'] = require('../apis/ec2-2016-04-01.min');
-  apiLoader.services['ec2']['2016-04-01'].paginators = require('../apis/ec2-2016-04-01.paginators').pagination;
-  apiLoader.services['ec2']['2016-04-01'].waiters = require('../apis/ec2-2016-04-01.waiters2').waiters;
+  apiLoader.services['ec2']['2016-04-01'] = require('../apis/ec2-2016-04-01.min.json');
+  apiLoader.services['ec2']['2016-04-01'].paginators = require('../apis/ec2-2016-04-01.paginators.json').pagination;
+  apiLoader.services['ec2']['2016-04-01'].waiters = require('../apis/ec2-2016-04-01.waiters2.json').waiters;
 }
 
 module.exports = AWS.EC2;
diff --git a/clients/ecr.js b/clients/ecr.js
index 34132a6781..bcc26441a3 100644
--- a/clients/ecr.js
+++ b/clients/ecr.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ECR')) {
   apiLoader.services['ecr'] = {};
   AWS.ECR = Service.defineService('ecr', ['2015-09-21']);
 
-  apiLoader.services['ecr']['2015-09-21'] = require('../apis/ecr-2015-09-21.min');
+  apiLoader.services['ecr']['2015-09-21'] = require('../apis/ecr-2015-09-21.min.json');
 }
 
 module.exports = AWS.ECR;
diff --git a/clients/ecs.js b/clients/ecs.js
index 2ce35895e2..1cc84712d8 100644
--- a/clients/ecs.js
+++ b/clients/ecs.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ECS')) {
   apiLoader.services['ecs'] = {};
   AWS.ECS = Service.defineService('ecs', ['2014-11-13']);
 
-  apiLoader.services['ecs']['2014-11-13'] = require('../apis/ecs-2014-11-13.min');
-  apiLoader.services['ecs']['2014-11-13'].paginators = require('../apis/ecs-2014-11-13.paginators').pagination;
-  apiLoader.services['ecs']['2014-11-13'].waiters = require('../apis/ecs-2014-11-13.waiters2').waiters;
+  apiLoader.services['ecs']['2014-11-13'] = require('../apis/ecs-2014-11-13.min.json');
+  apiLoader.services['ecs']['2014-11-13'].paginators = require('../apis/ecs-2014-11-13.paginators.json').pagination;
+  apiLoader.services['ecs']['2014-11-13'].waiters = require('../apis/ecs-2014-11-13.waiters2.json').waiters;
 }
 
 module.exports = AWS.ECS;
diff --git a/clients/efs.js b/clients/efs.js
index 74da36eed3..0d209c3966 100644
--- a/clients/efs.js
+++ b/clients/efs.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'EFS')) {
   apiLoader.services['efs'] = {};
   AWS.EFS = Service.defineService('efs', ['2015-02-01']);
 
-  apiLoader.services['efs']['2015-02-01'] = require('../apis/elasticfilesystem-2015-02-01.min');
+  apiLoader.services['efs']['2015-02-01'] = require('../apis/elasticfilesystem-2015-02-01.min.json');
 }
 
 module.exports = AWS.EFS;
diff --git a/clients/elasticache.js b/clients/elasticache.js
index c3dfe593c0..04f9afb9b4 100644
--- a/clients/elasticache.js
+++ b/clients/elasticache.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ElastiCache')) {
   apiLoader.services['elasticache'] = {};
   AWS.ElastiCache = Service.defineService('elasticache', ['2015-02-02']);
 
-  apiLoader.services['elasticache']['2015-02-02'] = require('../apis/elasticache-2015-02-02.min');
-  apiLoader.services['elasticache']['2015-02-02'].paginators = require('../apis/elasticache-2015-02-02.paginators').pagination;
-  apiLoader.services['elasticache']['2015-02-02'].waiters = require('../apis/elasticache-2015-02-02.waiters2').waiters;
+  apiLoader.services['elasticache']['2015-02-02'] = require('../apis/elasticache-2015-02-02.min.json');
+  apiLoader.services['elasticache']['2015-02-02'].paginators = require('../apis/elasticache-2015-02-02.paginators.json').pagination;
+  apiLoader.services['elasticache']['2015-02-02'].waiters = require('../apis/elasticache-2015-02-02.waiters2.json').waiters;
 }
 
 module.exports = AWS.ElastiCache;
diff --git a/clients/elasticbeanstalk.js b/clients/elasticbeanstalk.js
index 74364c8e43..be1b521690 100644
--- a/clients/elasticbeanstalk.js
+++ b/clients/elasticbeanstalk.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ElasticBeanstalk')) {
   apiLoader.services['elasticbeanstalk'] = {};
   AWS.ElasticBeanstalk = Service.defineService('elasticbeanstalk', ['2010-12-01']);
 
-  apiLoader.services['elasticbeanstalk']['2010-12-01'] = require('../apis/elasticbeanstalk-2010-12-01.min');
-  apiLoader.services['elasticbeanstalk']['2010-12-01'].paginators = require('../apis/elasticbeanstalk-2010-12-01.paginators').pagination;
+  apiLoader.services['elasticbeanstalk']['2010-12-01'] = require('../apis/elasticbeanstalk-2010-12-01.min.json');
+  apiLoader.services['elasticbeanstalk']['2010-12-01'].paginators = require('../apis/elasticbeanstalk-2010-12-01.paginators.json').pagination;
 }
 
 module.exports = AWS.ElasticBeanstalk;
diff --git a/clients/elastictranscoder.js b/clients/elastictranscoder.js
index a8ca058fef..f9e3494717 100644
--- a/clients/elastictranscoder.js
+++ b/clients/elastictranscoder.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ElasticTranscoder')) {
   apiLoader.services['elastictranscoder'] = {};
   AWS.ElasticTranscoder = Service.defineService('elastictranscoder', ['2012-09-25']);
 
-  apiLoader.services['elastictranscoder']['2012-09-25'] = require('../apis/elastictranscoder-2012-09-25.min');
-  apiLoader.services['elastictranscoder']['2012-09-25'].paginators = require('../apis/elastictranscoder-2012-09-25.paginators').pagination;
-  apiLoader.services['elastictranscoder']['2012-09-25'].waiters = require('../apis/elastictranscoder-2012-09-25.waiters2').waiters;
+  apiLoader.services['elastictranscoder']['2012-09-25'] = require('../apis/elastictranscoder-2012-09-25.min.json');
+  apiLoader.services['elastictranscoder']['2012-09-25'].paginators = require('../apis/elastictranscoder-2012-09-25.paginators.json').pagination;
+  apiLoader.services['elastictranscoder']['2012-09-25'].waiters = require('../apis/elastictranscoder-2012-09-25.waiters2.json').waiters;
 }
 
 module.exports = AWS.ElasticTranscoder;
diff --git a/clients/elb.js b/clients/elb.js
index d855b05c7c..4e61bf178d 100644
--- a/clients/elb.js
+++ b/clients/elb.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ELB')) {
   apiLoader.services['elb'] = {};
   AWS.ELB = Service.defineService('elb', ['2012-06-01']);
 
-  apiLoader.services['elb']['2012-06-01'] = require('../apis/elasticloadbalancing-2012-06-01.min');
-  apiLoader.services['elb']['2012-06-01'].paginators = require('../apis/elasticloadbalancing-2012-06-01.paginators').pagination;
-  apiLoader.services['elb']['2012-06-01'].waiters = require('../apis/elasticloadbalancing-2012-06-01.waiters2').waiters;
+  apiLoader.services['elb']['2012-06-01'] = require('../apis/elasticloadbalancing-2012-06-01.min.json');
+  apiLoader.services['elb']['2012-06-01'].paginators = require('../apis/elasticloadbalancing-2012-06-01.paginators.json').pagination;
+  apiLoader.services['elb']['2012-06-01'].waiters = require('../apis/elasticloadbalancing-2012-06-01.waiters2.json').waiters;
 }
 
 module.exports = AWS.ELB;
diff --git a/clients/elbv2.js b/clients/elbv2.js
index 649a43a8cd..f91761f76f 100644
--- a/clients/elbv2.js
+++ b/clients/elbv2.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ELBv2')) {
   apiLoader.services['elbv2'] = {};
   AWS.ELBv2 = Service.defineService('elbv2', ['2015-12-01']);
 
-  apiLoader.services['elbv2']['2015-12-01'] = require('../apis/elasticloadbalancingv2-2015-12-01.min');
-  apiLoader.services['elbv2']['2015-12-01'].paginators = require('../apis/elasticloadbalancingv2-2015-12-01.paginators').pagination;
+  apiLoader.services['elbv2']['2015-12-01'] = require('../apis/elasticloadbalancingv2-2015-12-01.min.json');
+  apiLoader.services['elbv2']['2015-12-01'].paginators = require('../apis/elasticloadbalancingv2-2015-12-01.paginators.json').pagination;
 }
 
 module.exports = AWS.ELBv2;
diff --git a/clients/emr.js b/clients/emr.js
index 5678d98e11..600572080f 100644
--- a/clients/emr.js
+++ b/clients/emr.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'EMR')) {
   apiLoader.services['emr'] = {};
   AWS.EMR = Service.defineService('emr', ['2009-03-31']);
 
-  apiLoader.services['emr']['2009-03-31'] = require('../apis/elasticmapreduce-2009-03-31.min');
-  apiLoader.services['emr']['2009-03-31'].paginators = require('../apis/elasticmapreduce-2009-03-31.paginators').pagination;
-  apiLoader.services['emr']['2009-03-31'].waiters = require('../apis/elasticmapreduce-2009-03-31.waiters2').waiters;
+  apiLoader.services['emr']['2009-03-31'] = require('../apis/elasticmapreduce-2009-03-31.min.json');
+  apiLoader.services['emr']['2009-03-31'].paginators = require('../apis/elasticmapreduce-2009-03-31.paginators.json').pagination;
+  apiLoader.services['emr']['2009-03-31'].waiters = require('../apis/elasticmapreduce-2009-03-31.waiters2.json').waiters;
 }
 
 module.exports = AWS.EMR;
diff --git a/clients/es.js b/clients/es.js
index a355b04e11..dc366daa23 100644
--- a/clients/es.js
+++ b/clients/es.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ES')) {
   apiLoader.services['es'] = {};
   AWS.ES = Service.defineService('es', ['2015-01-01']);
 
-  apiLoader.services['es']['2015-01-01'] = require('../apis/es-2015-01-01.min');
+  apiLoader.services['es']['2015-01-01'] = require('../apis/es-2015-01-01.min.json');
 }
 
 module.exports = AWS.ES;
diff --git a/clients/firehose.js b/clients/firehose.js
index ca5f6c15a8..3b2a07d0f8 100644
--- a/clients/firehose.js
+++ b/clients/firehose.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Firehose')) {
   apiLoader.services['firehose'] = {};
   AWS.Firehose = Service.defineService('firehose', ['2015-08-04']);
 
-  apiLoader.services['firehose']['2015-08-04'] = require('../apis/firehose-2015-08-04.min');
+  apiLoader.services['firehose']['2015-08-04'] = require('../apis/firehose-2015-08-04.min.json');
 }
 
 module.exports = AWS.Firehose;
diff --git a/clients/gamelift.js b/clients/gamelift.js
index 5c78c4faa4..6deeb3a2f0 100644
--- a/clients/gamelift.js
+++ b/clients/gamelift.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'GameLift')) {
   apiLoader.services['gamelift'] = {};
   AWS.GameLift = Service.defineService('gamelift', ['2015-10-01']);
 
-  apiLoader.services['gamelift']['2015-10-01'] = require('../apis/gamelift-2015-10-01.min');
+  apiLoader.services['gamelift']['2015-10-01'] = require('../apis/gamelift-2015-10-01.min.json');
 }
 
 module.exports = AWS.GameLift;
diff --git a/clients/glacier.js b/clients/glacier.js
index d29a7b78e5..7d4071c0e7 100644
--- a/clients/glacier.js
+++ b/clients/glacier.js
@@ -8,9 +8,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Glacier')) {
   AWS.Glacier = Service.defineService('glacier', ['2012-06-01']);
   require('../lib/services/glacier');
 
-  apiLoader.services['glacier']['2012-06-01'] = require('../apis/glacier-2012-06-01.min');
-  apiLoader.services['glacier']['2012-06-01'].paginators = require('../apis/glacier-2012-06-01.paginators').pagination;
-  apiLoader.services['glacier']['2012-06-01'].waiters = require('../apis/glacier-2012-06-01.waiters2').waiters;
+  apiLoader.services['glacier']['2012-06-01'] = require('../apis/glacier-2012-06-01.min.json');
+  apiLoader.services['glacier']['2012-06-01'].paginators = require('../apis/glacier-2012-06-01.paginators.json').pagination;
+  apiLoader.services['glacier']['2012-06-01'].waiters = require('../apis/glacier-2012-06-01.waiters2.json').waiters;
 }
 
 module.exports = AWS.Glacier;
diff --git a/clients/iam.js b/clients/iam.js
index 067574221d..375de386df 100644
--- a/clients/iam.js
+++ b/clients/iam.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'IAM')) {
   apiLoader.services['iam'] = {};
   AWS.IAM = Service.defineService('iam', ['2010-05-08']);
 
-  apiLoader.services['iam']['2010-05-08'] = require('../apis/iam-2010-05-08.min');
-  apiLoader.services['iam']['2010-05-08'].paginators = require('../apis/iam-2010-05-08.paginators').pagination;
-  apiLoader.services['iam']['2010-05-08'].waiters = require('../apis/iam-2010-05-08.waiters2').waiters;
+  apiLoader.services['iam']['2010-05-08'] = require('../apis/iam-2010-05-08.min.json');
+  apiLoader.services['iam']['2010-05-08'].paginators = require('../apis/iam-2010-05-08.paginators.json').pagination;
+  apiLoader.services['iam']['2010-05-08'].waiters = require('../apis/iam-2010-05-08.waiters2.json').waiters;
 }
 
 module.exports = AWS.IAM;
diff --git a/clients/importexport.js b/clients/importexport.js
index 83ebf6ab8d..f7a014c079 100644
--- a/clients/importexport.js
+++ b/clients/importexport.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ImportExport')) {
   apiLoader.services['importexport'] = {};
   AWS.ImportExport = Service.defineService('importexport', ['2010-06-01']);
 
-  apiLoader.services['importexport']['2010-06-01'] = require('../apis/importexport-2010-06-01.min');
-  apiLoader.services['importexport']['2010-06-01'].paginators = require('../apis/importexport-2010-06-01.paginators').pagination;
+  apiLoader.services['importexport']['2010-06-01'] = require('../apis/importexport-2010-06-01.min.json');
+  apiLoader.services['importexport']['2010-06-01'].paginators = require('../apis/importexport-2010-06-01.paginators.json').pagination;
 }
 
 module.exports = AWS.ImportExport;
diff --git a/clients/inspector.js b/clients/inspector.js
index 2a5cd416f0..eed3401ebc 100644
--- a/clients/inspector.js
+++ b/clients/inspector.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Inspector')) {
   apiLoader.services['inspector'] = {};
   AWS.Inspector = Service.defineService('inspector', ['2016-02-16']);
 
-  apiLoader.services['inspector']['2016-02-16'] = require('../apis/inspector-2016-02-16.min');
+  apiLoader.services['inspector']['2016-02-16'] = require('../apis/inspector-2016-02-16.min.json');
 }
 
 module.exports = AWS.Inspector;
diff --git a/clients/iot.js b/clients/iot.js
index ece604f9b5..dca2cbb974 100644
--- a/clients/iot.js
+++ b/clients/iot.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Iot')) {
   apiLoader.services['iot'] = {};
   AWS.Iot = Service.defineService('iot', ['2015-05-28']);
 
-  apiLoader.services['iot']['2015-05-28'] = require('../apis/iot-2015-05-28.min');
+  apiLoader.services['iot']['2015-05-28'] = require('../apis/iot-2015-05-28.min.json');
 }
 
 module.exports = AWS.Iot;
diff --git a/clients/iotdata.js b/clients/iotdata.js
index d8c753d183..1920ff8d1b 100644
--- a/clients/iotdata.js
+++ b/clients/iotdata.js
@@ -8,7 +8,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'IotData')) {
   AWS.IotData = Service.defineService('iotdata', ['2015-05-28']);
   require('../lib/services/iotdata');
 
-  apiLoader.services['iotdata']['2015-05-28'] = require('../apis/iot-data-2015-05-28.min');
+  apiLoader.services['iotdata']['2015-05-28'] = require('../apis/iot-data-2015-05-28.min.json');
 }
 
 module.exports = AWS.IotData;
diff --git a/clients/kinesis.js b/clients/kinesis.js
index b38dc866e5..512e277f94 100644
--- a/clients/kinesis.js
+++ b/clients/kinesis.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Kinesis')) {
   apiLoader.services['kinesis'] = {};
   AWS.Kinesis = Service.defineService('kinesis', ['2013-12-02']);
 
-  apiLoader.services['kinesis']['2013-12-02'] = require('../apis/kinesis-2013-12-02.min');
-  apiLoader.services['kinesis']['2013-12-02'].paginators = require('../apis/kinesis-2013-12-02.paginators').pagination;
-  apiLoader.services['kinesis']['2013-12-02'].waiters = require('../apis/kinesis-2013-12-02.waiters2').waiters;
+  apiLoader.services['kinesis']['2013-12-02'] = require('../apis/kinesis-2013-12-02.min.json');
+  apiLoader.services['kinesis']['2013-12-02'].paginators = require('../apis/kinesis-2013-12-02.paginators.json').pagination;
+  apiLoader.services['kinesis']['2013-12-02'].waiters = require('../apis/kinesis-2013-12-02.waiters2.json').waiters;
 }
 
 module.exports = AWS.Kinesis;
diff --git a/clients/kinesisanalytics.js b/clients/kinesisanalytics.js
index fba07a86dc..e815a583f3 100644
--- a/clients/kinesisanalytics.js
+++ b/clients/kinesisanalytics.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'KinesisAnalytics')) {
   apiLoader.services['kinesisanalytics'] = {};
   AWS.KinesisAnalytics = Service.defineService('kinesisanalytics', ['2015-08-14']);
 
-  apiLoader.services['kinesisanalytics']['2015-08-14'] = require('../apis/kinesisanalytics-2015-08-14.min');
+  apiLoader.services['kinesisanalytics']['2015-08-14'] = require('../apis/kinesisanalytics-2015-08-14.min.json');
 }
 
 module.exports = AWS.KinesisAnalytics;
diff --git a/clients/kms.js b/clients/kms.js
index 12b9641321..3b58c4d02c 100644
--- a/clients/kms.js
+++ b/clients/kms.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'KMS')) {
   apiLoader.services['kms'] = {};
   AWS.KMS = Service.defineService('kms', ['2014-11-01']);
 
-  apiLoader.services['kms']['2014-11-01'] = require('../apis/kms-2014-11-01.min');
-  apiLoader.services['kms']['2014-11-01'].paginators = require('../apis/kms-2014-11-01.paginators').pagination;
+  apiLoader.services['kms']['2014-11-01'] = require('../apis/kms-2014-11-01.min.json');
+  apiLoader.services['kms']['2014-11-01'].paginators = require('../apis/kms-2014-11-01.paginators.json').pagination;
 }
 
 module.exports = AWS.KMS;
diff --git a/clients/lambda.js b/clients/lambda.js
index 3582bc06f3..7b5f02d286 100644
--- a/clients/lambda.js
+++ b/clients/lambda.js
@@ -7,11 +7,11 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Lambda')) {
   apiLoader.services['lambda'] = {};
   AWS.Lambda = Service.defineService('lambda', ['2014-11-11', '2015-03-31']);
 
-  apiLoader.services['lambda']['2014-11-11'] = require('../apis/lambda-2014-11-11.min');
-  apiLoader.services['lambda']['2014-11-11'].paginators = require('../apis/lambda-2014-11-11.paginators').pagination;
+  apiLoader.services['lambda']['2014-11-11'] = require('../apis/lambda-2014-11-11.min.json');
+  apiLoader.services['lambda']['2014-11-11'].paginators = require('../apis/lambda-2014-11-11.paginators.json').pagination;
 
-  apiLoader.services['lambda']['2015-03-31'] = require('../apis/lambda-2015-03-31.min');
-  apiLoader.services['lambda']['2015-03-31'].paginators = require('../apis/lambda-2015-03-31.paginators').pagination;
+  apiLoader.services['lambda']['2015-03-31'] = require('../apis/lambda-2015-03-31.min.json');
+  apiLoader.services['lambda']['2015-03-31'].paginators = require('../apis/lambda-2015-03-31.paginators.json').pagination;
 }
 
 module.exports = AWS.Lambda;
diff --git a/clients/machinelearning.js b/clients/machinelearning.js
index 428eddbac9..958b3261ab 100644
--- a/clients/machinelearning.js
+++ b/clients/machinelearning.js
@@ -8,9 +8,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'MachineLearning')) {
   AWS.MachineLearning = Service.defineService('machinelearning', ['2014-12-12']);
   require('../lib/services/machinelearning');
 
-  apiLoader.services['machinelearning']['2014-12-12'] = require('../apis/machinelearning-2014-12-12.min');
-  apiLoader.services['machinelearning']['2014-12-12'].paginators = require('../apis/machinelearning-2014-12-12.paginators').pagination;
-  apiLoader.services['machinelearning']['2014-12-12'].waiters = require('../apis/machinelearning-2014-12-12.waiters2').waiters;
+  apiLoader.services['machinelearning']['2014-12-12'] = require('../apis/machinelearning-2014-12-12.min.json');
+  apiLoader.services['machinelearning']['2014-12-12'].paginators = require('../apis/machinelearning-2014-12-12.paginators.json').pagination;
+  apiLoader.services['machinelearning']['2014-12-12'].waiters = require('../apis/machinelearning-2014-12-12.waiters2.json').waiters;
 }
 
 module.exports = AWS.MachineLearning;
diff --git a/clients/marketplacecommerceanalytics.js b/clients/marketplacecommerceanalytics.js
index 32d6cd7c11..7af23a5a4c 100644
--- a/clients/marketplacecommerceanalytics.js
+++ b/clients/marketplacecommerceanalytics.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'MarketplaceCommerceAnalytics'))
   apiLoader.services['marketplacecommerceanalytics'] = {};
   AWS.MarketplaceCommerceAnalytics = Service.defineService('marketplacecommerceanalytics', ['2015-07-01']);
 
-  apiLoader.services['marketplacecommerceanalytics']['2015-07-01'] = require('../apis/marketplacecommerceanalytics-2015-07-01.min');
+  apiLoader.services['marketplacecommerceanalytics']['2015-07-01'] = require('../apis/marketplacecommerceanalytics-2015-07-01.min.json');
 }
 
 module.exports = AWS.MarketplaceCommerceAnalytics;
diff --git a/clients/marketplacemetering.js b/clients/marketplacemetering.js
index 93b1022671..398637e737 100644
--- a/clients/marketplacemetering.js
+++ b/clients/marketplacemetering.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'MarketplaceMetering')) {
   apiLoader.services['marketplacemetering'] = {};
   AWS.MarketplaceMetering = Service.defineService('marketplacemetering', ['2016-01-14']);
 
-  apiLoader.services['marketplacemetering']['2016-01-14'] = require('../apis/meteringmarketplace-2016-01-14.min');
+  apiLoader.services['marketplacemetering']['2016-01-14'] = require('../apis/meteringmarketplace-2016-01-14.min.json');
 }
 
 module.exports = AWS.MarketplaceMetering;
diff --git a/clients/mobileanalytics.js b/clients/mobileanalytics.js
index 8385d6e34b..8bbc9206d7 100644
--- a/clients/mobileanalytics.js
+++ b/clients/mobileanalytics.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'MobileAnalytics')) {
   apiLoader.services['mobileanalytics'] = {};
   AWS.MobileAnalytics = Service.defineService('mobileanalytics', ['2014-06-05']);
 
-  apiLoader.services['mobileanalytics']['2014-06-05'] = require('../apis/mobileanalytics-2014-06-05.min');
+  apiLoader.services['mobileanalytics']['2014-06-05'] = require('../apis/mobileanalytics-2014-06-05.min.json');
 }
 
 module.exports = AWS.MobileAnalytics;
diff --git a/clients/opsworks.js b/clients/opsworks.js
index 24f3e1b318..6f6bf311c5 100644
--- a/clients/opsworks.js
+++ b/clients/opsworks.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'OpsWorks')) {
   apiLoader.services['opsworks'] = {};
   AWS.OpsWorks = Service.defineService('opsworks', ['2013-02-18']);
 
-  apiLoader.services['opsworks']['2013-02-18'] = require('../apis/opsworks-2013-02-18.min');
-  apiLoader.services['opsworks']['2013-02-18'].paginators = require('../apis/opsworks-2013-02-18.paginators').pagination;
-  apiLoader.services['opsworks']['2013-02-18'].waiters = require('../apis/opsworks-2013-02-18.waiters2').waiters;
+  apiLoader.services['opsworks']['2013-02-18'] = require('../apis/opsworks-2013-02-18.min.json');
+  apiLoader.services['opsworks']['2013-02-18'].paginators = require('../apis/opsworks-2013-02-18.paginators.json').pagination;
+  apiLoader.services['opsworks']['2013-02-18'].waiters = require('../apis/opsworks-2013-02-18.waiters2.json').waiters;
 }
 
 module.exports = AWS.OpsWorks;
diff --git a/clients/rds.js b/clients/rds.js
index 02a8c4cb8c..a8ab662612 100644
--- a/clients/rds.js
+++ b/clients/rds.js
@@ -7,19 +7,19 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'RDS')) {
   apiLoader.services['rds'] = {};
   AWS.RDS = Service.defineService('rds', ['2013-01-10', '2013-02-12', '2013-09-09', '2014-10-31']);
 
-  apiLoader.services['rds']['2013-01-10'] = require('../apis/rds-2013-01-10.min');
-  apiLoader.services['rds']['2013-01-10'].paginators = require('../apis/rds-2013-01-10.paginators').pagination;
+  apiLoader.services['rds']['2013-01-10'] = require('../apis/rds-2013-01-10.min.json');
+  apiLoader.services['rds']['2013-01-10'].paginators = require('../apis/rds-2013-01-10.paginators.json').pagination;
 
-  apiLoader.services['rds']['2013-02-12'] = require('../apis/rds-2013-02-12.min');
-  apiLoader.services['rds']['2013-02-12'].paginators = require('../apis/rds-2013-02-12.paginators').pagination;
+  apiLoader.services['rds']['2013-02-12'] = require('../apis/rds-2013-02-12.min.json');
+  apiLoader.services['rds']['2013-02-12'].paginators = require('../apis/rds-2013-02-12.paginators.json').pagination;
 
-  apiLoader.services['rds']['2013-09-09'] = require('../apis/rds-2013-09-09.min');
-  apiLoader.services['rds']['2013-09-09'].paginators = require('../apis/rds-2013-09-09.paginators').pagination;
-  apiLoader.services['rds']['2013-09-09'].waiters = require('../apis/rds-2013-09-09.waiters2').waiters;
+  apiLoader.services['rds']['2013-09-09'] = require('../apis/rds-2013-09-09.min.json');
+  apiLoader.services['rds']['2013-09-09'].paginators = require('../apis/rds-2013-09-09.paginators.json').pagination;
+  apiLoader.services['rds']['2013-09-09'].waiters = require('../apis/rds-2013-09-09.waiters2.json').waiters;
 
-  apiLoader.services['rds']['2014-10-31'] = require('../apis/rds-2014-10-31.min');
-  apiLoader.services['rds']['2014-10-31'].paginators = require('../apis/rds-2014-10-31.paginators').pagination;
-  apiLoader.services['rds']['2014-10-31'].waiters = require('../apis/rds-2014-10-31.waiters2').waiters;
+  apiLoader.services['rds']['2014-10-31'] = require('../apis/rds-2014-10-31.min.json');
+  apiLoader.services['rds']['2014-10-31'].paginators = require('../apis/rds-2014-10-31.paginators.json').pagination;
+  apiLoader.services['rds']['2014-10-31'].waiters = require('../apis/rds-2014-10-31.waiters2.json').waiters;
 }
 
 module.exports = AWS.RDS;
diff --git a/clients/redshift.js b/clients/redshift.js
index ec9c4179c1..877b1017b8 100644
--- a/clients/redshift.js
+++ b/clients/redshift.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Redshift')) {
   apiLoader.services['redshift'] = {};
   AWS.Redshift = Service.defineService('redshift', ['2012-12-01']);
 
-  apiLoader.services['redshift']['2012-12-01'] = require('../apis/redshift-2012-12-01.min');
-  apiLoader.services['redshift']['2012-12-01'].paginators = require('../apis/redshift-2012-12-01.paginators').pagination;
-  apiLoader.services['redshift']['2012-12-01'].waiters = require('../apis/redshift-2012-12-01.waiters2').waiters;
+  apiLoader.services['redshift']['2012-12-01'] = require('../apis/redshift-2012-12-01.min.json');
+  apiLoader.services['redshift']['2012-12-01'].paginators = require('../apis/redshift-2012-12-01.paginators.json').pagination;
+  apiLoader.services['redshift']['2012-12-01'].waiters = require('../apis/redshift-2012-12-01.waiters2.json').waiters;
 }
 
 module.exports = AWS.Redshift;
diff --git a/clients/route53.js b/clients/route53.js
index 3916876533..7bfe0217a7 100644
--- a/clients/route53.js
+++ b/clients/route53.js
@@ -8,9 +8,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Route53')) {
   AWS.Route53 = Service.defineService('route53', ['2013-04-01']);
   require('../lib/services/route53');
 
-  apiLoader.services['route53']['2013-04-01'] = require('../apis/route53-2013-04-01.min');
-  apiLoader.services['route53']['2013-04-01'].paginators = require('../apis/route53-2013-04-01.paginators').pagination;
-  apiLoader.services['route53']['2013-04-01'].waiters = require('../apis/route53-2013-04-01.waiters2').waiters;
+  apiLoader.services['route53']['2013-04-01'] = require('../apis/route53-2013-04-01.min.json');
+  apiLoader.services['route53']['2013-04-01'].paginators = require('../apis/route53-2013-04-01.paginators.json').pagination;
+  apiLoader.services['route53']['2013-04-01'].waiters = require('../apis/route53-2013-04-01.waiters2.json').waiters;
 }
 
 module.exports = AWS.Route53;
diff --git a/clients/route53domains.js b/clients/route53domains.js
index 12ef53ff91..60b9d41598 100644
--- a/clients/route53domains.js
+++ b/clients/route53domains.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Route53Domains')) {
   apiLoader.services['route53domains'] = {};
   AWS.Route53Domains = Service.defineService('route53domains', ['2014-05-15']);
 
-  apiLoader.services['route53domains']['2014-05-15'] = require('../apis/route53domains-2014-05-15.min');
-  apiLoader.services['route53domains']['2014-05-15'].paginators = require('../apis/route53domains-2014-05-15.paginators').pagination;
+  apiLoader.services['route53domains']['2014-05-15'] = require('../apis/route53domains-2014-05-15.min.json');
+  apiLoader.services['route53domains']['2014-05-15'].paginators = require('../apis/route53domains-2014-05-15.paginators.json').pagination;
 }
 
 module.exports = AWS.Route53Domains;
diff --git a/clients/s3.js b/clients/s3.js
index 84561efec1..5a5a52bf8c 100644
--- a/clients/s3.js
+++ b/clients/s3.js
@@ -8,9 +8,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'S3')) {
   AWS.S3 = Service.defineService('s3', ['2006-03-01']);
   require('../lib/services/s3');
 
-  apiLoader.services['s3']['2006-03-01'] = require('../apis/s3-2006-03-01.min');
-  apiLoader.services['s3']['2006-03-01'].paginators = require('../apis/s3-2006-03-01.paginators').pagination;
-  apiLoader.services['s3']['2006-03-01'].waiters = require('../apis/s3-2006-03-01.waiters2').waiters;
+  apiLoader.services['s3']['2006-03-01'] = require('../apis/s3-2006-03-01.min.json');
+  apiLoader.services['s3']['2006-03-01'].paginators = require('../apis/s3-2006-03-01.paginators.json').pagination;
+  apiLoader.services['s3']['2006-03-01'].waiters = require('../apis/s3-2006-03-01.waiters2.json').waiters;
 }
 
 module.exports = AWS.S3;
diff --git a/clients/servicecatalog.js b/clients/servicecatalog.js
index 08412386e5..1113ece7b1 100644
--- a/clients/servicecatalog.js
+++ b/clients/servicecatalog.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'ServiceCatalog')) {
   apiLoader.services['servicecatalog'] = {};
   AWS.ServiceCatalog = Service.defineService('servicecatalog', ['2015-12-10']);
 
-  apiLoader.services['servicecatalog']['2015-12-10'] = require('../apis/servicecatalog-2015-12-10.min');
+  apiLoader.services['servicecatalog']['2015-12-10'] = require('../apis/servicecatalog-2015-12-10.min.json');
 }
 
 module.exports = AWS.ServiceCatalog;
diff --git a/clients/ses.js b/clients/ses.js
index f5f6499ec4..112155ca6e 100644
--- a/clients/ses.js
+++ b/clients/ses.js
@@ -7,9 +7,9 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'SES')) {
   apiLoader.services['ses'] = {};
   AWS.SES = Service.defineService('ses', ['2010-12-01']);
 
-  apiLoader.services['ses']['2010-12-01'] = require('../apis/email-2010-12-01.min');
-  apiLoader.services['ses']['2010-12-01'].paginators = require('../apis/email-2010-12-01.paginators').pagination;
-  apiLoader.services['ses']['2010-12-01'].waiters = require('../apis/email-2010-12-01.waiters2').waiters;
+  apiLoader.services['ses']['2010-12-01'] = require('../apis/email-2010-12-01.min.json');
+  apiLoader.services['ses']['2010-12-01'].paginators = require('../apis/email-2010-12-01.paginators.json').pagination;
+  apiLoader.services['ses']['2010-12-01'].waiters = require('../apis/email-2010-12-01.waiters2.json').waiters;
 }
 
 module.exports = AWS.SES;
diff --git a/clients/simpledb.js b/clients/simpledb.js
index 200f9c4d19..c4d8d2d7d3 100644
--- a/clients/simpledb.js
+++ b/clients/simpledb.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'SimpleDB')) {
   apiLoader.services['simpledb'] = {};
   AWS.SimpleDB = Service.defineService('simpledb', ['2009-04-15']);
 
-  apiLoader.services['simpledb']['2009-04-15'] = require('../apis/sdb-2009-04-15.min');
-  apiLoader.services['simpledb']['2009-04-15'].paginators = require('../apis/sdb-2009-04-15.paginators').pagination;
+  apiLoader.services['simpledb']['2009-04-15'] = require('../apis/sdb-2009-04-15.min.json');
+  apiLoader.services['simpledb']['2009-04-15'].paginators = require('../apis/sdb-2009-04-15.paginators.json').pagination;
 }
 
 module.exports = AWS.SimpleDB;
diff --git a/clients/snowball.js b/clients/snowball.js
index 9730b7086f..22ebaabfeb 100644
--- a/clients/snowball.js
+++ b/clients/snowball.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Snowball')) {
   apiLoader.services['snowball'] = {};
   AWS.Snowball = Service.defineService('snowball', ['2016-06-30']);
 
-  apiLoader.services['snowball']['2016-06-30'] = require('../apis/snowball-2016-06-30.min');
-  apiLoader.services['snowball']['2016-06-30'].paginators = require('../apis/snowball-2016-06-30.paginators').pagination;
+  apiLoader.services['snowball']['2016-06-30'] = require('../apis/snowball-2016-06-30.min.json');
+  apiLoader.services['snowball']['2016-06-30'].paginators = require('../apis/snowball-2016-06-30.paginators.json').pagination;
 }
 
 module.exports = AWS.Snowball;
diff --git a/clients/sns.js b/clients/sns.js
index fd3729c193..bb0a077a36 100644
--- a/clients/sns.js
+++ b/clients/sns.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'SNS')) {
   apiLoader.services['sns'] = {};
   AWS.SNS = Service.defineService('sns', ['2010-03-31']);
 
-  apiLoader.services['sns']['2010-03-31'] = require('../apis/sns-2010-03-31.min');
-  apiLoader.services['sns']['2010-03-31'].paginators = require('../apis/sns-2010-03-31.paginators').pagination;
+  apiLoader.services['sns']['2010-03-31'] = require('../apis/sns-2010-03-31.min.json');
+  apiLoader.services['sns']['2010-03-31'].paginators = require('../apis/sns-2010-03-31.paginators.json').pagination;
 }
 
 module.exports = AWS.SNS;
diff --git a/clients/sqs.js b/clients/sqs.js
index 7026914fc9..2d3e0d08a7 100644
--- a/clients/sqs.js
+++ b/clients/sqs.js
@@ -8,8 +8,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'SQS')) {
   AWS.SQS = Service.defineService('sqs', ['2012-11-05']);
   require('../lib/services/sqs');
 
-  apiLoader.services['sqs']['2012-11-05'] = require('../apis/sqs-2012-11-05.min');
-  apiLoader.services['sqs']['2012-11-05'].paginators = require('../apis/sqs-2012-11-05.paginators').pagination;
+  apiLoader.services['sqs']['2012-11-05'] = require('../apis/sqs-2012-11-05.min.json');
+  apiLoader.services['sqs']['2012-11-05'].paginators = require('../apis/sqs-2012-11-05.paginators.json').pagination;
 }
 
 module.exports = AWS.SQS;
diff --git a/clients/ssm.js b/clients/ssm.js
index 864e678bff..ae1dd3a4df 100644
--- a/clients/ssm.js
+++ b/clients/ssm.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'SSM')) {
   apiLoader.services['ssm'] = {};
   AWS.SSM = Service.defineService('ssm', ['2014-11-06']);
 
-  apiLoader.services['ssm']['2014-11-06'] = require('../apis/ssm-2014-11-06.min');
-  apiLoader.services['ssm']['2014-11-06'].paginators = require('../apis/ssm-2014-11-06.paginators').pagination;
+  apiLoader.services['ssm']['2014-11-06'] = require('../apis/ssm-2014-11-06.min.json');
+  apiLoader.services['ssm']['2014-11-06'].paginators = require('../apis/ssm-2014-11-06.paginators.json').pagination;
 }
 
 module.exports = AWS.SSM;
diff --git a/clients/storagegateway.js b/clients/storagegateway.js
index c6cca08c1c..2915f12a11 100644
--- a/clients/storagegateway.js
+++ b/clients/storagegateway.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'StorageGateway')) {
   apiLoader.services['storagegateway'] = {};
   AWS.StorageGateway = Service.defineService('storagegateway', ['2013-06-30']);
 
-  apiLoader.services['storagegateway']['2013-06-30'] = require('../apis/storagegateway-2013-06-30.min');
-  apiLoader.services['storagegateway']['2013-06-30'].paginators = require('../apis/storagegateway-2013-06-30.paginators').pagination;
+  apiLoader.services['storagegateway']['2013-06-30'] = require('../apis/storagegateway-2013-06-30.min.json');
+  apiLoader.services['storagegateway']['2013-06-30'].paginators = require('../apis/storagegateway-2013-06-30.paginators.json').pagination;
 }
 
 module.exports = AWS.StorageGateway;
diff --git a/clients/sts.js b/clients/sts.js
index 4abb311503..a7da8a4133 100644
--- a/clients/sts.js
+++ b/clients/sts.js
@@ -8,7 +8,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'STS')) {
   AWS.STS = Service.defineService('sts', ['2011-06-15']);
   require('../lib/services/sts');
 
-  apiLoader.services['sts']['2011-06-15'] = require('../apis/sts-2011-06-15.min');
+  apiLoader.services['sts']['2011-06-15'] = require('../apis/sts-2011-06-15.min.json');
 }
 
 module.exports = AWS.STS;
diff --git a/clients/support.js b/clients/support.js
index 52085c20b3..aceb5552a6 100644
--- a/clients/support.js
+++ b/clients/support.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'Support')) {
   apiLoader.services['support'] = {};
   AWS.Support = Service.defineService('support', ['2013-04-15']);
 
-  apiLoader.services['support']['2013-04-15'] = require('../apis/support-2013-04-15.min');
-  apiLoader.services['support']['2013-04-15'].paginators = require('../apis/support-2013-04-15.paginators').pagination;
+  apiLoader.services['support']['2013-04-15'] = require('../apis/support-2013-04-15.min.json');
+  apiLoader.services['support']['2013-04-15'].paginators = require('../apis/support-2013-04-15.paginators.json').pagination;
 }
 
 module.exports = AWS.Support;
diff --git a/clients/swf.js b/clients/swf.js
index e46154889a..6bf53e5458 100644
--- a/clients/swf.js
+++ b/clients/swf.js
@@ -8,8 +8,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'SWF')) {
   AWS.SWF = Service.defineService('swf', ['2012-01-25']);
   require('../lib/services/swf');
 
-  apiLoader.services['swf']['2012-01-25'] = require('../apis/swf-2012-01-25.min');
-  apiLoader.services['swf']['2012-01-25'].paginators = require('../apis/swf-2012-01-25.paginators').pagination;
+  apiLoader.services['swf']['2012-01-25'] = require('../apis/swf-2012-01-25.min.json');
+  apiLoader.services['swf']['2012-01-25'].paginators = require('../apis/swf-2012-01-25.paginators.json').pagination;
 }
 
 module.exports = AWS.SWF;
diff --git a/clients/waf.js b/clients/waf.js
index 890f6d5774..8cfa425ac2 100644
--- a/clients/waf.js
+++ b/clients/waf.js
@@ -7,7 +7,7 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'WAF')) {
   apiLoader.services['waf'] = {};
   AWS.WAF = Service.defineService('waf', ['2015-08-24']);
 
-  apiLoader.services['waf']['2015-08-24'] = require('../apis/waf-2015-08-24.min');
+  apiLoader.services['waf']['2015-08-24'] = require('../apis/waf-2015-08-24.min.json');
 }
 
 module.exports = AWS.WAF;
diff --git a/clients/workspaces.js b/clients/workspaces.js
index dd8cf8a9ea..1f5c4e05b0 100644
--- a/clients/workspaces.js
+++ b/clients/workspaces.js
@@ -7,8 +7,8 @@ if (!Object.prototype.hasOwnProperty.call(AWS, 'WorkSpaces')) {
   apiLoader.services['workspaces'] = {};
   AWS.WorkSpaces = Service.defineService('workspaces', ['2015-04-08']);
 
-  apiLoader.services['workspaces']['2015-04-08'] = require('../apis/workspaces-2015-04-08.min');
-  apiLoader.services['workspaces']['2015-04-08'].paginators = require('../apis/workspaces-2015-04-08.paginators').pagination;
+  apiLoader.services['workspaces']['2015-04-08'] = require('../apis/workspaces-2015-04-08.min.json');
+  apiLoader.services['workspaces']['2015-04-08'].paginators = require('../apis/workspaces-2015-04-08.paginators.json').pagination;
 }
 
 module.exports = AWS.WorkSpaces;
diff --git a/dist-tools/client-creator.js b/dist-tools/client-creator.js
index 62af233795..0c1470ab07 100644
--- a/dist-tools/client-creator.js
+++ b/dist-tools/client-creator.js
@@ -98,12 +98,12 @@ ClientCreator.prototype.generateClientStub = function generateClientStub(service
     }
     var loaderPrefix = 'AWS.apiLoader.services[\'' + serviceName + '\'][\'' + version + '\']';
     code += '\n';
-    code += loaderPrefix + ' = require(\'../apis/' + versionInfo.api + '\');\n';
+    code += loaderPrefix + ' = require(\'../apis/' + versionInfo.api + '.json\');\n';
     if (versionInfo.hasOwnProperty('paginators')) {
-        code += loaderPrefix + '.paginators = require(\'../apis/' + versionInfo.paginators + '\').pagination;\n';
+        code += loaderPrefix + '.paginators = require(\'../apis/' + versionInfo.paginators + '.json\').pagination;\n';
     }
     if (versionInfo.hasOwnProperty('waiters')) {
-        code += loaderPrefix + '.waiters = require(\'../apis/' + versionInfo.waiters + '\').waiters;\n';
+        code += loaderPrefix + '.waiters = require(\'../apis/' + versionInfo.waiters + '.json\').waiters;\n';
     }
   });
   return code;
@@ -148,12 +148,12 @@ ClientCreator.prototype.generateClientFileSource = function generateClientFileSo
     }
     var loaderPrefix = tab + 'apiLoader.services[\'' + serviceName + '\'][\'' + version + '\']';
     code += '\n';
-    code += loaderPrefix + ' = require(\'../apis/' + versionInfo.api + '\');\n';
+    code += loaderPrefix + ' = require(\'../apis/' + versionInfo.api + '.json\');\n';
     if (versionInfo.hasOwnProperty('paginators')) {
-        code += loaderPrefix + '.paginators = require(\'../apis/' + versionInfo.paginators + '\').pagination;\n';
+        code += loaderPrefix + '.paginators = require(\'../apis/' + versionInfo.paginators + '.json\').pagination;\n';
     }
     if (versionInfo.hasOwnProperty('waiters')) {
-        code += loaderPrefix + '.waiters = require(\'../apis/' + versionInfo.waiters + '\').waiters;\n';
+        code += loaderPrefix + '.waiters = require(\'../apis/' + versionInfo.waiters + '.json\').waiters;\n';
     }
   });
   code += '}\n';