diff --git a/package.json b/package.json
index 3bc052b..7944406 100644
--- a/package.json
+++ b/package.json
@@ -2,8 +2,8 @@
   "name": "onspring-api-sdk",
   "version": "1.0.0",
   "description": "A javascript SDK for interacting with version 2 of the Onspring API.",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/onspringApiSdk.js",
+  "types": "dist/onspringApiSdk.d.ts",
   "scripts": {
     "format-staged": "pretty-quick --staged",
     "format": "pretty-quick",
diff --git a/src/OnspringClient.ts b/src/models/OnspringClient.ts
similarity index 88%
rename from src/OnspringClient.ts
rename to src/models/OnspringClient.ts
index 8862e04..232f5d9 100644
--- a/src/OnspringClient.ts
+++ b/src/models/OnspringClient.ts
@@ -1,12 +1,12 @@
 import axios from 'axios';
 import { AxiosInstance, AxiosRequestConfig } from 'axios';
-import { ArgumentValidator } from './models/ArgumentValidator';
-import { EndpointFactory } from './models/EndpointFactory';
-import { ApiResponseFactory } from './models/ApiResponseFactory';
-import { ApiResponse } from './models/ApiResponse';
-import { PagingRequest } from './models/PagingRequest';
-import { GetPagedAppsResponse } from './models/GetPagedAppsResponse';
-import { App } from './models/App';
+import { ArgumentValidator } from './ArgumentValidator';
+import { EndpointFactory } from './EndpointFactory';
+import { ApiResponseFactory } from './ApiResponseFactory';
+import { ApiResponse } from './ApiResponse';
+import { PagingRequest } from './PagingRequest';
+import { GetPagedAppsResponse } from './GetPagedAppsResponse';
+import { App } from './App';
 
 /**
  * @class OnspringClient - A client that can communicate with the Onspring API.
diff --git a/src/index.ts b/src/onspringApiSdk.ts
similarity index 100%
rename from src/index.ts
rename to src/onspringApiSdk.ts
diff --git a/tests/OnspringClient.spec.ts b/tests/OnspringClient.spec.ts
index 7794609..595c713 100644
--- a/tests/OnspringClient.spec.ts
+++ b/tests/OnspringClient.spec.ts
@@ -1,4 +1,4 @@
-import { OnspringClient } from '../src/OnspringClient';
+import { OnspringClient } from '../src/models/OnspringClient';
 import { ApiResponse } from '../src/models/ApiResponse';
 import axios, { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import { expect } from 'chai';