package.j2 in datadog_api_client-2.0.0

- old
+ new

@@ -3,25 +3,20 @@
 =end
 
 # Common files
 require 'datadog_api_client/version'
 require 'datadog_api_client/user_agent'
-require '{{ gem_name }}/{{ version }}/api_client'
-require '{{ gem_name }}/{{ version }}/api_error'
-require '{{ gem_name }}/{{ version }}/configuration'
+require '{{ gem_name }}/api_client'
+require '{{ gem_name }}/configuration'
+require '{{ gem_name }}/api_key_configuration'
 
-# Models
+# Model base
+## Load in the model_base modules which also initializes the V1 and V2 namespaces
+{%- for version, models in all_models.items() %}
 require '{{ gem_name }}/{{ version }}/model_base'
-{%- for model in models|sort %}
-require '{{ gem_name }}/{{ version }}/models/{{ model|snake_case }}'
 {%- endfor %}
 
-# APIs
-{%- for api in apis|sort %}
-require '{{ gem_name }}/{{ version }}/api/{{ api|snake_case }}_api'
-{%- endfor %}
-
-module {{ module_name }}::{{ version|upper }}
+module {{ module_name }}
   class << self
     # Customize default settings for the SDK using block.
     #   {{ module_name }}::{{ version|upper }}.configure do |config|
     #     config.username = "xxx"
     #     config.password = "xxx"