diff --git a/lib/AlertApi.js b/lib/api/alert.js
similarity index 100%
rename from lib/AlertApi.js
rename to lib/api/alert.js
diff --git a/lib/DashApi.js b/lib/api/dash.js
similarity index 100%
rename from lib/DashApi.js
rename to lib/api/dash.js
diff --git a/lib/EventApi.js b/lib/api/event.js
similarity index 100%
rename from lib/EventApi.js
rename to lib/api/event.js
diff --git a/lib/InfrastructureApi.js b/lib/api/infrastructure.js
similarity index 100%
rename from lib/InfrastructureApi.js
rename to lib/api/infrastructure.js
diff --git a/lib/MetricApi.js b/lib/api/metric.js
similarity index 100%
rename from lib/MetricApi.js
rename to lib/api/metric.js
diff --git a/lib/BaseClient.js b/lib/http_client.js
similarity index 100%
rename from lib/BaseClient.js
rename to lib/http_client.js
diff --git a/lib/index.js b/lib/index.js
index bce8821..2d0d6cb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,22 +1,22 @@
 var extend = require('extend');
 
-var BaseClient = require('./BaseClient.js');
-var AlertApi = require('./AlertApi.js');
-var DashApi = require('./DashApi.js');
-var EventApi = require('./EventApi.js');
-var InfrastructureApi = require('./InfrastructureApi.js');
-var MetricApi = require('./MetricApi.js');
+var http_client = require('./http_client.js');
+var alert_api = require('./api/alert.js');
+var dash_api = require('./api/dash.js');
+var event_api = require('./api/event.js');
+var infrastructure_api = require('./api/infrastructure.js');
+var metric_api = require('./api/metric.js');
 
-var DogHttpApi = function(options){
-    BaseClient.call(this, options);
+var dogapi = function(options){
+    http_client.call(this, options);
 };
 
-extend(DogHttpApi.prototype,
-       BaseClient.prototype,
-       AlertApi.prototype,
-       DashApi.prototype,
-       EventApi.prototype,
-       InfrastructureApi.prototype,
-       MetricApi.prototype);
+extend(dogapi.prototype,
+       http_client.prototype,
+       alert_api.prototype,
+       dash_api.prototype,
+       event_api.prototype,
+       infrastructure_api.prototype,
+       metric_api.prototype);
 
-return module.exports = DogHttpApi;
+return module.exports = dogapi;