Re-parent models and requests

Author: Caitlin Bales (MSFT)

Templates/Java/BaseJavaModel.template.tt

@@ -504,17 +504,19 @@
 
 import {0}.concurrency.*;
 import {0}.core.*;
-import {0}.extensions.*;
+import {0}.models.extensions.*;
+import {0}.models.generated.*;
 import {0}.http.*;
-import {0}.generated.*;
+import {0}.requests.extensions.*;
+import {0}.requests.generated.*;
 import {0}.options.*;
 import {0}.serializer.*;
 
 import java.util.Arrays;
 import java.util.EnumSet;";
         return string.Format(format,
             host.CurrentModel.NamespaceName(),
-            host.TemplateInfo.OutputParentDirectory);
+            host.TemplateInfo.OutputParentDirectory.Replace("_", "."));
         }
 
     /// Creates a class declaration

Templates/Java/extensions/Client.java.tt …es/Java/models_extensions/Client.java.ttTemplates/Java/extensions/Client.java.tt renamed to Templates/Java/models_extensions/Client.java.tt Templates/Java/extensions/Client.java.tt renamed to Templates/Java/models_extensions/Client.java.tt

@@ -4,7 +4,6 @@
 <#@ output extension="\\" #>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
-<#=AddCustomImport(TypeName(c))#>
 <#=CreateClassDef(TypeName(c), BaseTypeName(c))#>
 
 }