Substitute require for require_relativerelative

require_relative is significantly faster and should be used when available.

Signed-off-by: Tim Smith <tsmith@chef.io>

90 files changed, 219 insertions, 219 deletions

diff --git a/lib/chef_zero.rb b/lib/chef_zero.rb
index 4fdb4a0..77da1d6 100644
--- a/lib/chef_zero.rb
+++ b/lib/chef_zero.rb
@@ -1,5 +1,5 @@
 module ChefZero
-  require "chef_zero/log"
+  require_relative "chef_zero/log"
 
   MIN_API_VERSION = 0
   MAX_API_VERSION = 2
diff --git a/lib/chef_zero/chef_data/data_normalizer.rb b/lib/chef_zero/chef_data/data_normalizer.rb
index b69fcaf..c34e2e0 100644
--- a/lib/chef_zero/chef_data/data_normalizer.rb
+++ b/lib/chef_zero/chef_data/data_normalizer.rb
@@ -1,6 +1,6 @@
-require "chef_zero"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/default_creator"
+require_relative "../../chef_zero"
+require_relative "../rest_base"
+require_relative "default_creator"
 
 module ChefZero
   module ChefData
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb
index 5f6cf8b..8809f91 100644
--- a/lib/chef_zero/chef_data/default_creator.rb
+++ b/lib/chef_zero/chef_data/default_creator.rb
@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/acl_path"
+require_relative "acl_path"
 
 module ChefZero
   module ChefData
diff --git a/lib/chef_zero/data_store/data_already_exists_error.rb b/lib/chef_zero/data_store/data_already_exists_error.rb
index 60f5b57..f9bcba3 100644
--- a/lib/chef_zero/data_store/data_already_exists_error.rb
+++ b/lib/chef_zero/data_store/data_already_exists_error.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_error"
+require_relative "data_error"
 
 module ChefZero
   module DataStore
diff --git a/lib/chef_zero/data_store/data_not_found_error.rb b/lib/chef_zero/data_store/data_not_found_error.rb
index 508b460..ef02353 100644
--- a/lib/chef_zero/data_store/data_not_found_error.rb
+++ b/lib/chef_zero/data_store/data_not_found_error.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_error"
+require_relative "data_error"
 
 module ChefZero
   module DataStore
diff --git a/lib/chef_zero/data_store/default_facade.rb b/lib/chef_zero/data_store/default_facade.rb
index 6c94dff..fe9d06a 100644
--- a/lib/chef_zero/data_store/default_facade.rb
+++ b/lib/chef_zero/data_store/default_facade.rb
@@ -1,5 +1,5 @@
-require "chef_zero/data_store/interface_v2"
-require "chef_zero/chef_data/default_creator"
+require_relative "interface_v2"
+require_relative "../chef_data/default_creator"
 
 module ChefZero
   module DataStore
diff --git a/lib/chef_zero/data_store/interface_v2.rb b/lib/chef_zero/data_store/interface_v2.rb
index 8c02e2e..4b24e1d 100644
--- a/lib/chef_zero/data_store/interface_v2.rb
+++ b/lib/chef_zero/data_store/interface_v2.rb
@@ -1,4 +1,4 @@
-require "chef_zero/data_store/interface_v1"
+require_relative "interface_v1"
 
 module ChefZero
   module DataStore
diff --git a/lib/chef_zero/data_store/memory_store.rb b/lib/chef_zero/data_store/memory_store.rb
index fa2a9cf..cc76b23 100644
--- a/lib/chef_zero/data_store/memory_store.rb
+++ b/lib/chef_zero/data_store/memory_store.rb
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/v2_to_v1_adapter"
-require "chef_zero/data_store/memory_store_v2"
-require "chef_zero/data_store/default_facade"
+require_relative "v2_to_v1_adapter"
+require_relative "memory_store_v2"
+require_relative "default_facade"
 
 module ChefZero
   module DataStore
diff --git a/lib/chef_zero/data_store/memory_store_v2.rb b/lib/chef_zero/data_store/memory_store_v2.rb
index 8e041b5..f01b81f 100644
--- a/lib/chef_zero/data_store/memory_store_v2.rb
+++ b/lib/chef_zero/data_store/memory_store_v2.rb
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_already_exists_error"
-require "chef_zero/data_store/data_not_found_error"
-require "chef_zero/data_store/interface_v2"
+require_relative "data_already_exists_error"
+require_relative "data_not_found_error"
+require_relative "interface_v2"
 
 module ChefZero
   module DataStore
diff --git a/lib/chef_zero/data_store/raw_file_store.rb b/lib/chef_zero/data_store/raw_file_store.rb
index 31bf08a..ce787a6 100644
--- a/lib/chef_zero/data_store/raw_file_store.rb
+++ b/lib/chef_zero/data_store/raw_file_store.rb
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_already_exists_error"
-require "chef_zero/data_store/data_not_found_error"
-require "chef_zero/data_store/interface_v2"
+require_relative "data_already_exists_error"
+require_relative "data_not_found_error"
+require_relative "interface_v2"
 require "fileutils"
 
 module ChefZero
diff --git a/lib/chef_zero/data_store/v1_to_v2_adapter.rb b/lib/chef_zero/data_store/v1_to_v2_adapter.rb
index 874c05a..66d8490 100644
--- a/lib/chef_zero/data_store/v1_to_v2_adapter.rb
+++ b/lib/chef_zero/data_store/v1_to_v2_adapter.rb
@@ -1,4 +1,4 @@
-require "chef_zero/data_store/interface_v2"
+require_relative "interface_v2"
 
 module ChefZero
   module DataStore
diff --git a/lib/chef_zero/data_store/v2_to_v1_adapter.rb b/lib/chef_zero/data_store/v2_to_v1_adapter.rb
index 38f2bc1..cfb7132 100644
--- a/lib/chef_zero/data_store/v2_to_v1_adapter.rb
+++ b/lib/chef_zero/data_store/v2_to_v1_adapter.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/interface_v1"
+require_relative "interface_v1"
 
 module ChefZero
   module DataStore
diff --git a/lib/chef_zero/endpoints/acl_endpoint.rb b/lib/chef_zero/endpoints/acl_endpoint.rb
index e389f2d..1a19d8e 100644
--- a/lib/chef_zero/endpoints/acl_endpoint.rb
+++ b/lib/chef_zero/endpoints/acl_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/acl_path"
+require_relative "../rest_base"
+require_relative "../chef_data/acl_path"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/acls_endpoint.rb b/lib/chef_zero/endpoints/acls_endpoint.rb
index 64840cd..9c99584 100644
--- a/lib/chef_zero/endpoints/acls_endpoint.rb
+++ b/lib/chef_zero/endpoints/acls_endpoint.rb
@@ -1,7 +1,7 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
-require "chef_zero/chef_data/acl_path"
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
+require_relative "../chef_data/acl_path"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/actor_default_key_endpoint.rb b/lib/chef_zero/endpoints/actor_default_key_endpoint.rb
index 1985dea..9deccd3 100644
--- a/lib/chef_zero/endpoints/actor_default_key_endpoint.rb
+++ b/lib/chef_zero/endpoints/actor_default_key_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/actor_endpoint.rb b/lib/chef_zero/endpoints/actor_endpoint.rb
index 4cba31a..ba0b57b 100644
--- a/lib/chef_zero/endpoints/actor_endpoint.rb
+++ b/lib/chef_zero/endpoints/actor_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/actor_key_endpoint.rb b/lib/chef_zero/endpoints/actor_key_endpoint.rb
index a61d2f3..291def2 100644
--- a/lib/chef_zero/endpoints/actor_key_endpoint.rb
+++ b/lib/chef_zero/endpoints/actor_key_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/actor_keys_endpoint.rb b/lib/chef_zero/endpoints/actor_keys_endpoint.rb
index b3bab9a..71af2cb 100644
--- a/lib/chef_zero/endpoints/actor_keys_endpoint.rb
+++ b/lib/chef_zero/endpoints/actor_keys_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/actors_endpoint.rb b/lib/chef_zero/endpoints/actors_endpoint.rb
index f4a2160..79a72a8 100644
--- a/lib/chef_zero/endpoints/actors_endpoint.rb
+++ b/lib/chef_zero/endpoints/actors_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_list_endpoint"
+require_relative "rest_list_endpoint"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/authenticate_user_endpoint.rb b/lib/chef_zero/endpoints/authenticate_user_endpoint.rb
index e54b8f1..701abf0 100644
--- a/lib/chef_zero/endpoints/authenticate_user_endpoint.rb
+++ b/lib/chef_zero/endpoints/authenticate_user_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/container_endpoint.rb b/lib/chef_zero/endpoints/container_endpoint.rb
index 95b92ca..04724c1 100644
--- a/lib/chef_zero/endpoints/container_endpoint.rb
+++ b/lib/chef_zero/endpoints/container_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/containers_endpoint.rb b/lib/chef_zero/endpoints/containers_endpoint.rb
index e8708ed..4384929 100644
--- a/lib/chef_zero/endpoints/containers_endpoint.rb
+++ b/lib/chef_zero/endpoints/containers_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_list_endpoint"
+require_relative "rest_list_endpoint"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/controls_endpoint.rb b/lib/chef_zero/endpoints/controls_endpoint.rb
index b7021af..b981699 100644
--- a/lib/chef_zero/endpoints/controls_endpoint.rb
+++ b/lib/chef_zero/endpoints/controls_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/dist"
+require_relative "../dist"
 module ChefZero
   module Endpoints
     # /organizations/ORG/controls
diff --git a/lib/chef_zero/endpoints/cookbook_artifact_endpoint.rb b/lib/chef_zero/endpoints/cookbook_artifact_endpoint.rb
index d0cf822..59da82c 100644
--- a/lib/chef_zero/endpoints/cookbook_artifact_endpoint.rb
+++ b/lib/chef_zero/endpoints/cookbook_artifact_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/cookbook_artifact_identifier_endpoint.rb b/lib/chef_zero/endpoints/cookbook_artifact_identifier_endpoint.rb
index 9f7b973..0dfb831 100644
--- a/lib/chef_zero/endpoints/cookbook_artifact_identifier_endpoint.rb
+++ b/lib/chef_zero/endpoints/cookbook_artifact_identifier_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb b/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
index e2d1d2a..d613916 100644
--- a/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
+++ b/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/cookbook_endpoint.rb b/lib/chef_zero/endpoints/cookbook_endpoint.rb
index 8c4d49d..d2d58ef 100644
--- a/lib/chef_zero/endpoints/cookbook_endpoint.rb
+++ b/lib/chef_zero/endpoints/cookbook_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/endpoints/cookbooks_base"
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/cookbook_version_endpoint.rb b/lib/chef_zero/endpoints/cookbook_version_endpoint.rb
index 0ee5be7..2b8a14a 100644
--- a/lib/chef_zero/endpoints/cookbook_version_endpoint.rb
+++ b/lib/chef_zero/endpoints/cookbook_version_endpoint.rb
@@ -1,8 +1,8 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/rest_error_response"
-require "chef_zero/chef_data/data_normalizer"
-require "chef_zero/data_store/data_not_found_error"
+require_relative "rest_object_endpoint"
+require_relative "../rest_error_response"
+require_relative "../chef_data/data_normalizer"
+require_relative "../data_store/data_not_found_error"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/cookbooks_base.rb b/lib/chef_zero/endpoints/cookbooks_base.rb
index e515992..a943082 100644
--- a/lib/chef_zero/endpoints/cookbooks_base.rb
+++ b/lib/chef_zero/endpoints/cookbooks_base.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/cookbooks_endpoint.rb b/lib/chef_zero/endpoints/cookbooks_endpoint.rb
index e3e2ebe..bba0596 100644
--- a/lib/chef_zero/endpoints/cookbooks_endpoint.rb
+++ b/lib/chef_zero/endpoints/cookbooks_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/endpoints/cookbooks_base"
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/data_bag_endpoint.rb b/lib/chef_zero/endpoints/data_bag_endpoint.rb
index 8d1a96f..6b41c7a 100644
--- a/lib/chef_zero/endpoints/data_bag_endpoint.rb
+++ b/lib/chef_zero/endpoints/data_bag_endpoint.rb
@@ -1,7 +1,7 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_list_endpoint"
-require "chef_zero/endpoints/data_bag_item_endpoint"
-require "chef_zero/rest_error_response"
+require_relative "rest_list_endpoint"
+require_relative "data_bag_item_endpoint"
+require_relative "../rest_error_response"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/data_bag_item_endpoint.rb b/lib/chef_zero/endpoints/data_bag_item_endpoint.rb
index ec21ab0..0c6f3e2 100644
--- a/lib/chef_zero/endpoints/data_bag_item_endpoint.rb
+++ b/lib/chef_zero/endpoints/data_bag_item_endpoint.rb
@@ -1,7 +1,7 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/endpoints/data_bag_item_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "data_bag_item_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/data_bags_endpoint.rb b/lib/chef_zero/endpoints/data_bags_endpoint.rb
index 5b9dd14..de48499 100644
--- a/lib/chef_zero/endpoints/data_bags_endpoint.rb
+++ b/lib/chef_zero/endpoints/data_bags_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_list_endpoint"
+require_relative "rest_list_endpoint"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb
index 3e4bb61..d88c198 100644
--- a/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/cookbooks_base"
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
index 43ef4ce..10bcba5 100644
--- a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/rest_error_response"
+require_relative "../rest_base"
+require_relative "../rest_error_response"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb
index ced6345..07a5a3b 100644
--- a/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/cookbooks_base"
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/environment_endpoint.rb b/lib/chef_zero/endpoints/environment_endpoint.rb
index 37f0169..d2a6d86 100644
--- a/lib/chef_zero/endpoints/environment_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/environment_nodes_endpoint.rb b/lib/chef_zero/endpoints/environment_nodes_endpoint.rb
index 55e1877..7f0dbab 100644
--- a/lib/chef_zero/endpoints/environment_nodes_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_nodes_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/environment_recipes_endpoint.rb b/lib/chef_zero/endpoints/environment_recipes_endpoint.rb
index d79660e..1d69d99 100644
--- a/lib/chef_zero/endpoints/environment_recipes_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_recipes_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/cookbooks_base"
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/environment_role_endpoint.rb b/lib/chef_zero/endpoints/environment_role_endpoint.rb
index 9d3ce3e..b0d0cf5 100644
--- a/lib/chef_zero/endpoints/environment_role_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_role_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/cookbooks_base"
+require_relative "cookbooks_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/file_store_file_endpoint.rb b/lib/chef_zero/endpoints/file_store_file_endpoint.rb
index 290d7d9..9f69268 100644
--- a/lib/chef_zero/endpoints/file_store_file_endpoint.rb
+++ b/lib/chef_zero/endpoints/file_store_file_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/group_endpoint.rb b/lib/chef_zero/endpoints/group_endpoint.rb
index b1b4f8f..a831dbc 100644
--- a/lib/chef_zero/endpoints/group_endpoint.rb
+++ b/lib/chef_zero/endpoints/group_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/groups_endpoint.rb b/lib/chef_zero/endpoints/groups_endpoint.rb
index 47cd101..424fe13 100644
--- a/lib/chef_zero/endpoints/groups_endpoint.rb
+++ b/lib/chef_zero/endpoints/groups_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_list_endpoint"
+require_relative "rest_list_endpoint"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/license_endpoint.rb b/lib/chef_zero/endpoints/license_endpoint.rb
index ec85834..949a661 100644
--- a/lib/chef_zero/endpoints/license_endpoint.rb
+++ b/lib/chef_zero/endpoints/license_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/node_endpoint.rb b/lib/chef_zero/endpoints/node_endpoint.rb
index 689b631..e311871 100644
--- a/lib/chef_zero/endpoints/node_endpoint.rb
+++ b/lib/chef_zero/endpoints/node_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/node_identifiers_endpoint.rb b/lib/chef_zero/endpoints/node_identifiers_endpoint.rb
index b62693a..2081593 100644
--- a/lib/chef_zero/endpoints/node_identifiers_endpoint.rb
+++ b/lib/chef_zero/endpoints/node_identifiers_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 require "uuidtools"
 
 module ChefZero
diff --git a/lib/chef_zero/endpoints/nodes_endpoint.rb b/lib/chef_zero/endpoints/nodes_endpoint.rb
index d828a11..513b147 100644
--- a/lib/chef_zero/endpoints/nodes_endpoint.rb
+++ b/lib/chef_zero/endpoints/nodes_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_association_request_endpoint.rb b/lib/chef_zero/endpoints/organization_association_request_endpoint.rb
index c73d816..fb719e3 100644
--- a/lib/chef_zero/endpoints/organization_association_request_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_association_request_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb b/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb
index cb4005d..d16a8b7 100644
--- a/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb b/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb
index 8a7abf7..ba8e13a 100644
--- a/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_endpoint.rb b/lib/chef_zero/endpoints/organization_endpoint.rb
index 3c14548..d6a2dde 100644
--- a/lib/chef_zero/endpoints/organization_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_user_base.rb b/lib/chef_zero/endpoints/organization_user_base.rb
index 5be119d..8b806c1 100644
--- a/lib/chef_zero/endpoints/organization_user_base.rb
+++ b/lib/chef_zero/endpoints/organization_user_base.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_user_default_key_endpoint.rb b/lib/chef_zero/endpoints/organization_user_default_key_endpoint.rb
index ad10377..4a366d7 100644
--- a/lib/chef_zero/endpoints/organization_user_default_key_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_user_default_key_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_user_endpoint.rb b/lib/chef_zero/endpoints/organization_user_endpoint.rb
index 7e69439..f29bdce 100644
--- a/lib/chef_zero/endpoints/organization_user_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_user_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_user_key_endpoint.rb b/lib/chef_zero/endpoints/organization_user_key_endpoint.rb
index 8e1cfc1..94719f3 100644
--- a/lib/chef_zero/endpoints/organization_user_key_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_user_key_endpoint.rb
@@ -1,5 +1,5 @@
-require "chef_zero/rest_base"
-require "chef_zero/endpoints/actor_keys_endpoint"
+require_relative "../rest_base"
+require_relative "actor_keys_endpoint"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_user_keys_endpoint.rb b/lib/chef_zero/endpoints/organization_user_keys_endpoint.rb
index c08e3fa..afc0941 100644
--- a/lib/chef_zero/endpoints/organization_user_keys_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_user_keys_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_users_endpoint.rb b/lib/chef_zero/endpoints/organization_users_endpoint.rb
index fd41c48..7a26fa1 100644
--- a/lib/chef_zero/endpoints/organization_users_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_users_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/endpoints/organization_user_base"
+require_relative "../rest_base"
+require_relative "organization_user_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb b/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb
index 2251f00..11e535a 100644
--- a/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 require "uuidtools"
 
 module ChefZero
diff --git a/lib/chef_zero/endpoints/organizations_endpoint.rb b/lib/chef_zero/endpoints/organizations_endpoint.rb
index 6ad46fe..aa5c8e2 100644
--- a/lib/chef_zero/endpoints/organizations_endpoint.rb
+++ b/lib/chef_zero/endpoints/organizations_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 require "uuidtools"
 
 module ChefZero
diff --git a/lib/chef_zero/endpoints/policies_endpoint.rb b/lib/chef_zero/endpoints/policies_endpoint.rb
index 3a8deea..1b6f7ce 100644
--- a/lib/chef_zero/endpoints/policies_endpoint.rb
+++ b/lib/chef_zero/endpoints/policies_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/policy_endpoint.rb b/lib/chef_zero/endpoints/policy_endpoint.rb
index 1e80278..6d13575 100644
--- a/lib/chef_zero/endpoints/policy_endpoint.rb
+++ b/lib/chef_zero/endpoints/policy_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/policy_group_endpoint.rb b/lib/chef_zero/endpoints/policy_group_endpoint.rb
index 573dc17..5e4c2f5 100644
--- a/lib/chef_zero/endpoints/policy_group_endpoint.rb
+++ b/lib/chef_zero/endpoints/policy_group_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb b/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb
index a34da32..0b8fc03 100644
--- a/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb
+++ b/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/policy_groups_endpoint.rb b/lib/chef_zero/endpoints/policy_groups_endpoint.rb
index a706268..c22bf34 100644
--- a/lib/chef_zero/endpoints/policy_groups_endpoint.rb
+++ b/lib/chef_zero/endpoints/policy_groups_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../rest_base"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/policy_revision_endpoint.rb b/lib/chef_zero/endpoints/policy_revision_endpoint.rb
index c825510..be19fdc 100644
--- a/lib/chef_zero/endpoints/policy_revision_endpoint.rb
+++ b/lib/chef_zero/endpoints/policy_revision_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/policy_revisions_endpoint.rb b/lib/chef_zero/endpoints/policy_revisions_endpoint.rb
index d755f81..260e53c 100644
--- a/lib/chef_zero/endpoints/policy_revisions_endpoint.rb
+++ b/lib/chef_zero/endpoints/policy_revisions_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/data_normalizer"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/principal_endpoint.rb b/lib/chef_zero/endpoints/principal_endpoint.rb
index ebd8315..b59a0c9 100644
--- a/lib/chef_zero/endpoints/principal_endpoint.rb
+++ b/lib/chef_zero/endpoints/principal_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero"
-require "chef_zero/rest_base"
+require_relative "../../chef_zero"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/rest_list_endpoint.rb b/lib/chef_zero/endpoints/rest_list_endpoint.rb
index 135f0e9..7f8b894 100644
--- a/lib/chef_zero/endpoints/rest_list_endpoint.rb
+++ b/lib/chef_zero/endpoints/rest_list_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/rest_object_endpoint.rb b/lib/chef_zero/endpoints/rest_object_endpoint.rb
index 5d6ae40..33c042e 100644
--- a/lib/chef_zero/endpoints/rest_object_endpoint.rb
+++ b/lib/chef_zero/endpoints/rest_object_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
-require "chef_zero/rest_error_response"
+require_relative "../rest_base"
+require_relative "../rest_error_response"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/role_endpoint.rb b/lib/chef_zero/endpoints/role_endpoint.rb
index 4e31cdc..acef570 100644
--- a/lib/chef_zero/endpoints/role_endpoint.rb
+++ b/lib/chef_zero/endpoints/role_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/role_environments_endpoint.rb b/lib/chef_zero/endpoints/role_environments_endpoint.rb
index 625e13a..15712d9 100644
--- a/lib/chef_zero/endpoints/role_environments_endpoint.rb
+++ b/lib/chef_zero/endpoints/role_environments_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/sandbox_endpoint.rb b/lib/chef_zero/endpoints/sandbox_endpoint.rb
index d7eb4de..d9c9976 100644
--- a/lib/chef_zero/endpoints/sandbox_endpoint.rb
+++ b/lib/chef_zero/endpoints/sandbox_endpoint.rb
@@ -1,5 +1,5 @@
-require "chef_zero/rest_base"
-require "chef_zero/rest_error_response"
+require_relative "../rest_base"
+require_relative "../rest_error_response"
 require "ffi_yajl"
 
 module ChefZero
diff --git a/lib/chef_zero/endpoints/sandboxes_endpoint.rb b/lib/chef_zero/endpoints/sandboxes_endpoint.rb
index 62fea76..258344b 100644
--- a/lib/chef_zero/endpoints/sandboxes_endpoint.rb
+++ b/lib/chef_zero/endpoints/sandboxes_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/search_endpoint.rb b/lib/chef_zero/endpoints/search_endpoint.rb
index e2f30ce..5b1a4cd 100644
--- a/lib/chef_zero/endpoints/search_endpoint.rb
+++ b/lib/chef_zero/endpoints/search_endpoint.rb
@@ -1,9 +1,9 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
-require "chef_zero/rest_error_response"
-require "chef_zero/solr/solr_parser"
-require "chef_zero/solr/solr_doc"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
+require_relative "../rest_error_response"
+require_relative "../solr/solr_parser"
+require_relative "../solr/solr_doc"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/searches_endpoint.rb b/lib/chef_zero/endpoints/searches_endpoint.rb
index 748a93c..4797c37 100644
--- a/lib/chef_zero/endpoints/searches_endpoint.rb
+++ b/lib/chef_zero/endpoints/searches_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/server_api_version_endpoint.rb b/lib/chef_zero/endpoints/server_api_version_endpoint.rb
index ba32257..14cd0a6 100644
--- a/lib/chef_zero/endpoints/server_api_version_endpoint.rb
+++ b/lib/chef_zero/endpoints/server_api_version_endpoint.rb
@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/system_recovery_endpoint.rb b/lib/chef_zero/endpoints/system_recovery_endpoint.rb
index 0ad2293..2938d52 100644
--- a/lib/chef_zero/endpoints/system_recovery_endpoint.rb
+++ b/lib/chef_zero/endpoints/system_recovery_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/universe_endpoint.rb b/lib/chef_zero/endpoints/universe_endpoint.rb
index 5ee59b1..dc34bfe 100644
--- a/lib/chef_zero/endpoints/universe_endpoint.rb
+++ b/lib/chef_zero/endpoints/universe_endpoint.rb
@@ -1,6 +1,6 @@
 require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/user_association_request_endpoint.rb b/lib/chef_zero/endpoints/user_association_request_endpoint.rb
index 580ba49..294339e 100644
--- a/lib/chef_zero/endpoints/user_association_request_endpoint.rb
+++ b/lib/chef_zero/endpoints/user_association_request_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb b/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb
index 617b2b1..ff809e3 100644
--- a/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb
+++ b/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/user_association_requests_endpoint.rb b/lib/chef_zero/endpoints/user_association_requests_endpoint.rb
index c8db13b..114296c 100644
--- a/lib/chef_zero/endpoints/user_association_requests_endpoint.rb
+++ b/lib/chef_zero/endpoints/user_association_requests_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/user_organizations_endpoint.rb b/lib/chef_zero/endpoints/user_organizations_endpoint.rb
index 4e40eb0..505a504 100644
--- a/lib/chef_zero/endpoints/user_organizations_endpoint.rb
+++ b/lib/chef_zero/endpoints/user_organizations_endpoint.rb
@@ -1,5 +1,5 @@
 require "ffi_yajl"
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/endpoints/version_endpoint.rb b/lib/chef_zero/endpoints/version_endpoint.rb
index 3ec687e..5483417 100644
--- a/lib/chef_zero/endpoints/version_endpoint.rb
+++ b/lib/chef_zero/endpoints/version_endpoint.rb
@@ -1,5 +1,5 @@
-require "chef_zero/rest_base"
-require "chef_zero/dist"
+require_relative "../rest_base"
+require_relative "../dist"
 
 module ChefZero
   module Endpoints
diff --git a/lib/chef_zero/rest_base.rb b/lib/chef_zero/rest_base.rb
index 4cf73ba..c7a6fc5 100644
--- a/lib/chef_zero/rest_base.rb
+++ b/lib/chef_zero/rest_base.rb
@@ -1,7 +1,7 @@
-require "chef_zero/rest_request"
-require "chef_zero/rest_error_response"
-require "chef_zero/data_store/data_not_found_error"
-require "chef_zero/chef_data/acl_path"
+require_relative "rest_request"
+require_relative "rest_error_response"
+require_relative "data_store/data_not_found_error"
+require_relative "chef_data/acl_path"
 
 module ChefZero
   class RestBase
diff --git a/lib/chef_zero/rspec.rb b/lib/chef_zero/rspec.rb
index 496cea5..4747dbb 100644
--- a/lib/chef_zero/rspec.rb
+++ b/lib/chef_zero/rspec.rb
@@ -1,6 +1,6 @@
 require "tempfile"
-require "chef_zero/server"
-require "chef_zero/rest_request"
+require_relative "server"
+require_relative "rest_request"
 
 module ChefZero
   module RSpec
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index 0c60f78..ca82e23 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -26,87 +26,87 @@ require "rack"
 require "webrick"
 require "webrick/https"
 
-require "chef_zero"
-require "chef_zero/socketless_server_map"
-require "chef_zero/chef_data/cookbook_data"
-require "chef_zero/chef_data/acl_path"
-require "chef_zero/rest_router"
-require "chef_zero/data_store/memory_store_v2"
-require "chef_zero/data_store/v1_to_v2_adapter"
-require "chef_zero/data_store/default_facade"
-require "chef_zero/version"
+require_relative "../chef_zero"
+require_relative "socketless_server_map"
+require_relative "chef_data/cookbook_data"
+require_relative "chef_data/acl_path"
+require_relative "rest_router"
+require_relative "data_store/memory_store_v2"
+require_relative "data_store/v1_to_v2_adapter"
+require_relative "data_store/default_facade"
+require_relative "version"
 require "chef_zero/dist.rb"
 
-require "chef_zero/endpoints/rest_list_endpoint"
-require "chef_zero/endpoints/authenticate_user_endpoint"
-require "chef_zero/endpoints/acls_endpoint"
-require "chef_zero/endpoints/acl_endpoint"
-require "chef_zero/endpoints/actor_endpoint"
-require "chef_zero/endpoints/actors_endpoint"
-require "chef_zero/endpoints/actor_key_endpoint"
-require "chef_zero/endpoints/organization_user_key_endpoint"
-require "chef_zero/endpoints/organization_user_default_key_endpoint"
-require "chef_zero/endpoints/organization_user_keys_endpoint"
-require "chef_zero/endpoints/actor_default_key_endpoint"
-require "chef_zero/endpoints/actor_keys_endpoint"
-require "chef_zero/endpoints/cookbooks_endpoint"
-require "chef_zero/endpoints/cookbook_endpoint"
-require "chef_zero/endpoints/cookbook_version_endpoint"
-require "chef_zero/endpoints/cookbook_artifacts_endpoint"
-require "chef_zero/endpoints/cookbook_artifact_endpoint"
-require "chef_zero/endpoints/cookbook_artifact_identifier_endpoint"
-require "chef_zero/endpoints/containers_endpoint"
-require "chef_zero/endpoints/container_endpoint"
-require "chef_zero/endpoints/controls_endpoint"
-require "chef_zero/endpoints/dummy_endpoint"
-require "chef_zero/endpoints/data_bags_endpoint"
-require "chef_zero/endpoints/data_bag_endpoint"
-require "chef_zero/endpoints/data_bag_item_endpoint"
-require "chef_zero/endpoints/groups_endpoint"
-require "chef_zero/endpoints/group_endpoint"
-require "chef_zero/endpoints/environment_endpoint"
-require "chef_zero/endpoints/environment_cookbooks_endpoint"
-require "chef_zero/endpoints/environment_cookbook_endpoint"
-require "chef_zero/endpoints/environment_cookbook_versions_endpoint"
-require "chef_zero/endpoints/environment_nodes_endpoint"
-require "chef_zero/endpoints/environment_recipes_endpoint"
-require "chef_zero/endpoints/environment_role_endpoint"
-require "chef_zero/endpoints/license_endpoint"
-require "chef_zero/endpoints/node_endpoint"
-require "chef_zero/endpoints/nodes_endpoint"
-require "chef_zero/endpoints/node_identifiers_endpoint"
-require "chef_zero/endpoints/organizations_endpoint"
-require "chef_zero/endpoints/organization_endpoint"
-require "chef_zero/endpoints/organization_association_requests_endpoint"
-require "chef_zero/endpoints/organization_association_request_endpoint"
-require "chef_zero/endpoints/organization_authenticate_user_endpoint"
-require "chef_zero/endpoints/organization_users_endpoint"
-require "chef_zero/endpoints/organization_user_endpoint"
-require "chef_zero/endpoints/organization_validator_key_endpoint"
-require "chef_zero/endpoints/policies_endpoint"
-require "chef_zero/endpoints/policy_endpoint"
-require "chef_zero/endpoints/policy_revisions_endpoint"
-require "chef_zero/endpoints/policy_revision_endpoint"
-require "chef_zero/endpoints/policy_groups_endpoint"
-require "chef_zero/endpoints/policy_group_endpoint"
-require "chef_zero/endpoints/policy_group_policy_endpoint"
-require "chef_zero/endpoints/principal_endpoint"
-require "chef_zero/endpoints/role_endpoint"
-require "chef_zero/endpoints/role_environments_endpoint"
-require "chef_zero/endpoints/sandboxes_endpoint"
-require "chef_zero/endpoints/sandbox_endpoint"
-require "chef_zero/endpoints/searches_endpoint"
-require "chef_zero/endpoints/search_endpoint"
-require "chef_zero/endpoints/system_recovery_endpoint"
-require "chef_zero/endpoints/user_association_requests_endpoint"
-require "chef_zero/endpoints/user_association_requests_count_endpoint"
-require "chef_zero/endpoints/user_association_request_endpoint"
-require "chef_zero/endpoints/user_organizations_endpoint"
-require "chef_zero/endpoints/file_store_file_endpoint"
-require "chef_zero/endpoints/not_found_endpoint"
-require "chef_zero/endpoints/version_endpoint"
-require "chef_zero/endpoints/server_api_version_endpoint"
-require "chef_zero/endpoints/universe_endpoint"
+require_relative "endpoints/rest_list_endpoint"
+require_relative "endpoints/authenticate_user_endpoint"
+require_relative "endpoints/acls_endpoint"
+require_relative "endpoints/acl_endpoint"
+require_relative "endpoints/actor_endpoint"
+require_relative "endpoints/actors_endpoint"
+require_relative "endpoints/actor_key_endpoint"
+require_relative "endpoints/organization_user_key_endpoint"
+require_relative "endpoints/organization_user_default_key_endpoint"
+require_relative "endpoints/organization_user_keys_endpoint"
+require_relative "endpoints/actor_default_key_endpoint"
+require_relative "endpoints/actor_keys_endpoint"
+require_relative "endpoints/cookbooks_endpoint"
+require_relative "endpoints/cookbook_endpoint"
+require_relative "endpoints/cookbook_version_endpoint"
+require_relative "endpoints/cookbook_artifacts_endpoint"
+require_relative "endpoints/cookbook_artifact_endpoint"
+require_relative "endpoints/cookbook_artifact_identifier_endpoint"
+require_relative "endpoints/containers_endpoint"
+require_relative "endpoints/container_endpoint"
+require_relative "endpoints/controls_endpoint"
+require_relative "endpoints/dummy_endpoint"
+require_relative "endpoints/data_bags_endpoint"
+require_relative "endpoints/data_bag_endpoint"
+require_relative "endpoints/data_bag_item_endpoint"
+require_relative "endpoints/groups_endpoint"
+require_relative "endpoints/group_endpoint"
+require_relative "endpoints/environment_endpoint"
+require_relative "endpoints/environment_cookbooks_endpoint"
+require_relative "endpoints/environment_cookbook_endpoint"
+require_relative "endpoints/environment_cookbook_versions_endpoint"
+require_relative "endpoints/environment_nodes_endpoint"
+require_relative "endpoints/environment_recipes_endpoint"
+require_relative "endpoints/environment_role_endpoint"
+require_relative "endpoints/license_endpoint"
+require_relative "endpoints/node_endpoint"
+require_relative "endpoints/nodes_endpoint"
+require_relative "endpoints/node_identifiers_endpoint"
+require_relative "endpoints/organizations_endpoint"
+require_relative "endpoints/organization_endpoint"
+require_relative "endpoints/organization_association_requests_endpoint"
+require_relative "endpoints/organization_association_request_endpoint"
+require_relative "endpoints/organization_authenticate_user_endpoint"
+require_relative "endpoints/organization_users_endpoint"
+require_relative "endpoints/organization_user_endpoint"
+require_relative "endpoints/organization_validator_key_endpoint"
+require_relative "endpoints/policies_endpoint"
+require_relative "endpoints/policy_endpoint"
+require_relative "endpoints/policy_revisions_endpoint"
+require_relative "endpoints/policy_revision_endpoint"
+require_relative "endpoints/policy_groups_endpoint"
+require_relative "endpoints/policy_group_endpoint"
+require_relative "endpoints/policy_group_policy_endpoint"
+require_relative "endpoints/principal_endpoint"
+require_relative "endpoints/role_endpoint"
+require_relative "endpoints/role_environments_endpoint"
+require_relative "endpoints/sandboxes_endpoint"
+require_relative "endpoints/sandbox_endpoint"
+require_relative "endpoints/searches_endpoint"
+require_relative "endpoints/search_endpoint"
+require_relative "endpoints/system_recovery_endpoint"
+require_relative "endpoints/user_association_requests_endpoint"
+require_relative "endpoints/user_association_requests_count_endpoint"
+require_relative "endpoints/user_association_request_endpoint"
+require_relative "endpoints/user_organizations_endpoint"
+require_relative "endpoints/file_store_file_endpoint"
+require_relative "endpoints/not_found_endpoint"
+require_relative "endpoints/version_endpoint"
+require_relative "endpoints/server_api_version_endpoint"
+require_relative "endpoints/universe_endpoint"
 
 module ChefZero
 
diff --git a/lib/chef_zero/socketless_server_map.rb b/lib/chef_zero/socketless_server_map.rb
index 1e7c1e2..6aecba2 100644
--- a/lib/chef_zero/socketless_server_map.rb
+++ b/lib/chef_zero/socketless_server_map.rb
@@ -18,7 +18,7 @@
 
 require "thread"
 require "singleton"
-require "chef_zero/dist"
+require_relative "dist"
 
 module ChefZero
 
diff --git a/lib/chef_zero/solr/query/phrase.rb b/lib/chef_zero/solr/query/phrase.rb
index d345a8e..4812452 100644
--- a/lib/chef_zero/solr/query/phrase.rb
+++ b/lib/chef_zero/solr/query/phrase.rb
@@ -1,4 +1,4 @@
-require "chef_zero/solr/query/regexpable_query"
+require_relative "regexpable_query"
 
 module ChefZero
   module Solr
diff --git a/lib/chef_zero/solr/query/term.rb b/lib/chef_zero/solr/query/term.rb
index b98d281..f90b750 100644
--- a/lib/chef_zero/solr/query/term.rb
+++ b/lib/chef_zero/solr/query/term.rb
@@ -1,4 +1,4 @@
-require "chef_zero/solr/query/regexpable_query"
+require_relative "regexpable_query"
 
 module ChefZero
   module Solr
diff --git a/lib/chef_zero/solr/solr_parser.rb b/lib/chef_zero/solr/solr_parser.rb
index 86c232f..7868fe9 100644
--- a/lib/chef_zero/solr/solr_parser.rb
+++ b/lib/chef_zero/solr/solr_parser.rb
@@ -1,9 +1,9 @@
-require "chef_zero/solr/query/binary_operator"
-require "chef_zero/solr/query/unary_operator"
-require "chef_zero/solr/query/term"
-require "chef_zero/solr/query/phrase"
-require "chef_zero/solr/query/range_query"
-require "chef_zero/solr/query/subquery"
+require_relative "query/binary_operator"
+require_relative "query/unary_operator"
+require_relative "query/term"
+require_relative "query/phrase"
+require_relative "query/range_query"
+require_relative "query/subquery"
 
 module ChefZero
   module Solr