diff --git a/aws-es-transport.gemspec b/aws-es-transport.gemspec
index 32d9e0e..03a3acd 100644
--- a/aws-es-transport.gemspec
+++ b/aws-es-transport.gemspec
@@ -1,11 +1,12 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'aws_es_transport'
+
+require_relative 'lib/aws-es-transport'
 
 Gem::Specification.new do |spec|
   spec.name          = "aws-es-transport"
-  spec.version       = AwsEsTransport::VERSION
+  spec.version       = AwsEsTransport::Version::VER_STRING
   spec.authors       = ["Cary Dunn"]
   spec.email         = ["cary.dunn@gmail.com"]
 
@@ -18,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", '~> 1.8'
+  spec.add_development_dependency "rake", '~> 10.0'
 
-  spec.add_runtime_dependency 'elasticsearch', ['>= 1.0.10', '~> 1.0']
+  spec.add_runtime_dependency 'elasticsearch', ['>= 2.0','<= 6.0']
   spec.add_runtime_dependency "aws-sdk", ['>= 2.1.14', '~> 2.1']
-  spec.add_runtime_dependency "faraday", '~> 0.9.1'
-  spec.add_runtime_dependency "faraday_middleware", '~> 0.10.0'
+  spec.add_runtime_dependency "faraday", '~> 0.12'
+  spec.add_runtime_dependency "faraday_middleware", '~> 0.11.0.1'
 end
diff --git a/lib/aws-es-transport.rb b/lib/aws-es-transport.rb
new file mode 100644
index 0000000..489d8f9
--- /dev/null
+++ b/lib/aws-es-transport.rb
@@ -0,0 +1,4 @@
+require 'aws-es-transport/version'
+require 'aws-es-transport/aws_v4_signer_impl'
+require 'aws-es-transport/aws_v4_signer'
+require 'aws-es-transport/elasticsearch/transport/transport/http/aws'
diff --git a/lib/aws_v4_signer.rb b/lib/aws-es-transport/aws_v4_signer.rb
similarity index 73%
rename from lib/aws_v4_signer.rb
rename to lib/aws-es-transport/aws_v4_signer.rb
index 4df1cf2..f59332a 100644
--- a/lib/aws_v4_signer.rb
+++ b/lib/aws-es-transport/aws_v4_signer.rb
@@ -1,5 +1,5 @@
 require 'faraday'
-require_relative 'aws_v4_signer_impl'
+require 'aws-es-transport/aws_v4_signer_impl'
 
 module FaradayMiddleware
   Faraday::Request.register_middleware aws_v4_signer: lambda { AwsV4Signer }
diff --git a/lib/aws_v4_signer_impl.rb b/lib/aws-es-transport/aws_v4_signer_impl.rb
similarity index 100%
rename from lib/aws_v4_signer_impl.rb
rename to lib/aws-es-transport/aws_v4_signer_impl.rb
diff --git a/lib/elasticsearch/transport/transport/http/aws.rb b/lib/aws-es-transport/elasticsearch/transport/transport/http/aws.rb
similarity index 100%
rename from lib/elasticsearch/transport/transport/http/aws.rb
rename to lib/aws-es-transport/elasticsearch/transport/transport/http/aws.rb
diff --git a/lib/aws-es-transport/version.rb b/lib/aws-es-transport/version.rb
new file mode 100644
index 0000000..c85998d
--- /dev/null
+++ b/lib/aws-es-transport/version.rb
@@ -0,0 +1,9 @@
+module AwsEsTransport
+  module Version
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 3
+
+    VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
+  end
+end
diff --git a/lib/aws_es_transport.rb b/lib/aws_es_transport.rb
deleted file mode 100644
index d2a9fae..0000000
--- a/lib/aws_es_transport.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require_relative "elasticsearch/transport/transport/http/aws"
-module AwsEsTransport
-  VERSION = "0.1.3"
-end