diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_report_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_report_spec.rb
index 6c69f914f7..b0f8ec0d72 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_report_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_report_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/azure_report'
 
-require 'azure_report'
+require 'generated/azure_report'
 
 include AzureReportModule
 
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_special_properties_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_special_properties_spec.rb
index 6ff29ac477..45d7abcd09 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_special_properties_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_special_properties_spec.rb
@@ -5,7 +5,7 @@
 require 'rspec'
 require 'securerandom'
 
-require 'azure_special_properties'
+require 'generated/azure_special_properties'
 
 include AzureSpecialPropertiesModule
 
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_url_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_url_spec.rb
index ef1b8322f3..7124691360 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_url_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/azure_url_spec.rb
@@ -5,7 +5,7 @@
 require 'rspec'
 require 'securerandom'
 
-require 'subscription_id_api_version'
+require 'generated/subscription_id_api_version'
 
 include AzureUrlModule
 
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb
index 29a5dff237..e1ef43d736 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/custom_base_uri_more'
 
-require 'custom_base_url_more_options'
+require 'generated/custom_base_url_more_options'
 require 'uri'
 
 module CustomBaseUriMoreModule
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb
index c3eb81c719..87896e1279 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/custom_base_uri'
 
-require 'custom_base_url'
+require 'generated/custom_base_url'
 require 'uri'
 
 module CustomBaseUriModule
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_exception_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_exception_spec.rb
index b7ac162949..4117dde442 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_exception_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_exception_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/head_exceptions'
 
 require 'rspec'
-require 'head_exceptions'
+require 'generated/head_exceptions'
 
 include HeadExceptionsModule
 
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_spec.rb
index 7b4cd203fb..6be813c050 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/head_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/head'
 
 require 'rspec'
-require 'head'
+require 'generated/head'
 
 include HeadModule
 
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/lro_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/lro_spec.rb
index 508ee7144e..ebc37ae783 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/lro_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/lro_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/lro'
 
 require 'rspec'
-require 'lro'
+require 'generated/lro'
 
 include LroModule
 include LroModule::Models
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/paging_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/paging_spec.rb
index a6e6ea4172..e78f08e8c5 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/paging_spec.rb
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/paging_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/paging'
 
 require 'rspec'
-require 'paging'
+require 'generated/paging'
 
 include PagingModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/array_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/array_spec.rb
index d85c50307e..c78494c9ec 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/array_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/array_spec.rb
@@ -4,7 +4,7 @@
 $: << 'RspecTests/Generated/array'
 
 require 'rspec'
-require 'body_array'
+require 'generated/body_array'
 require 'helper'
 
 module ArrayModule
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/bool_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/bool_spec.rb
index 3f1948f8a6..e1e20b9e28 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/bool_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/bool_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests'
 $: << 'RspecTests/Generated/boolean'
 
-require 'body_boolean'
+require 'generated/body_boolean'
 
 module BooleanModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/byte_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/byte_spec.rb
index a7a1f9f7a0..a0d24f67a0 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/byte_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/byte_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/byte'
 
-require 'body_byte'
+require 'generated/body_byte'
 
 module ByteModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/complex_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/complex_spec.rb
index bf9ba30c52..2274cc9ede 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/complex_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/complex_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/complex'
 
 require 'base64'
-require 'body_complex'
+require 'generated/body_complex'
 
 module ComplexModule
   include ComplexModule::Models
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/date_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/date_spec.rb
index 616f1289f9..a14a620916 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/date_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/date_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/date'
 
 require 'rspec'
-require 'body_date'
+require 'generated/body_date'
 
 describe DateModule::Date do
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_rfc1123_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_rfc1123_spec.rb
index 1ba32b69de..883ed2f311 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_rfc1123_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_rfc1123_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/datetime_rfc1123'
 
 require 'rspec'
-require 'body_datetime_rfc1123'
+require 'generated/body_datetime_rfc1123'
 require_relative './helper'
 
 include DatetimeRfc1123Module
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_spec.rb
index 42e20c9a81..2f77591d43 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/datetime_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/datetime'
 
 require 'rspec'
-require 'body_datetime'
+require 'generated/body_datetime'
 require_relative './helper'
 
 include DatetimeModule
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/dictionary_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/dictionary_spec.rb
index 592efbc78d..ed86695c64 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/dictionary_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/dictionary_spec.rb
@@ -4,7 +4,7 @@
 $: << 'RspecTests'
 
 require 'base64'
-require 'body_dictionary'
+require 'generated/body_dictionary'
 require 'helper'
 
 include DictionaryModule
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/header_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/header_spec.rb
index 6378ca13c6..91e2bcbced 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/header_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/header_spec.rb
@@ -5,7 +5,7 @@
 
 
 require "base64"
-require 'header'
+require 'generated/header'
 
 module HeaderModule
   include HeaderModule::Models
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/http_infrastructure_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/http_infrastructure_spec.rb
index e14e17d324..211f3cada7 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/http_infrastructure_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/http_infrastructure_spec.rb
@@ -4,7 +4,7 @@
 $: << 'RspecTests'
 
 require 'rspec'
-require 'http_infrastructure.rb'
+require 'generated/http_infrastructure.rb'
 require 'helper'
 
 module HttpInfrastructureModule
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb
index f7556f6741..b8a55ad54f 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/integer'
 
-require 'body_integer'
+require 'generated/body_integer'
 
 include IntegerModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/model_flattening_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/model_flattening_spec.rb
index 2cb9be3a05..06391a50ba 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/model_flattening_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/model_flattening_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/Generated/model_flattening'
 
 require 'securerandom'
-require 'model_flattening'
+require 'generated/model_flattening'
 
 include ModelFlatteningModule
 include ModelFlatteningModule::Models
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/number_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/number_spec.rb
index 2d3ee83e45..2027da0ee5 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/number_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/number_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/number'
 
-require 'body_number'
+require 'generated/body_number'
 
 include NumberModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_items_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_items_spec.rb
index 680aff9ccb..6c4411c512 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_items_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_items_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/url_items'
 
-require 'url'
+require 'generated/url'
 
 include UrlModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb
index 3c2676513f..3dfcf908e9 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/url'
 
-require 'url'
+require 'generated/url'
 
 include UrlModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/query_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/query_spec.rb
index 0fac09f395..2e1e206340 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/query_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/query_spec.rb
@@ -3,7 +3,7 @@
 $: << 'RspecTests/url_query'
 
 require 'rspec'
-require 'url'
+require 'generated/url'
 
 include UrlModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/report_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/report_spec.rb
index 1fe06709bc..72c5b92f9d 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/report_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/report_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/report'
 
-require 'report'
+require 'generated/report'
 
 include ReportModule
 
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/required_optional_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/required_optional_spec.rb
index fbcc0ecaf6..531dd672b5 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/required_optional_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/required_optional_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/required_optional'
 
-require 'required_optional'
+require 'generated/required_optional'
 
 include RequiredOptionalModule
 include RequiredOptionalModule::Models
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/string_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/string_spec.rb
index 223d1cfdb6..3ee8fa777d 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/string_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/string_spec.rb
@@ -2,7 +2,7 @@
 
 $: << 'RspecTests/Generated/string'
 
-require 'body_string'
+require 'generated/body_string'
 
 include StringModule