From f1ec60d026f3b94d0b4dc084ae40708803242fa2 Mon Sep 17 00:00:00 2001
From: Todd Thomson <todd.thomson@me.com>
Date: Fri, 28 Jan 2022 11:18:52 -0800
Subject: [PATCH] Progress towards beta release #1

---
 Mila/Mila.vcxproj                             | 65 +++++++++---------
 Mila/Mila.vcxproj.filters                     | 67 +++++++++----------
 .../{CudnnContext.ixx => CuDnn.Context.ixx}   |  0
 ...DnnDescriptor.ixx => CuDnn.Descriptor.ixx} |  0
 .../CuDNN/{CuDnnError.ixx => CuDnn.Error.ixx} |  0
 .../{CuDnnHelpers.ixx => CuDnn.Helpers.ixx}   |  0
 ...criptor.ixx => CuDnn.OpaqueDescriptor.ixx} |  0
 ...ype.ixx => CuDnn.OpaqueDescriptorType.ixx} |  0
 ...paqueHandle.ixx => CuDnn.OpaqueHandle.ixx} |  0
 .../{CuDnnStatus.ixx => CuDnn.Status.ixx}     |  0
 .../CuDNN/{CuDnnUtils.ixx => CuDnn.Utils.ixx} |  0
 Mila/Source/Dnn/CuDNN/CuDnn.ixx               |  3 +-
 .../Cuda/{CudaDevice.ixx => Cuda.Device.ixx}  |  0
 ...daDeviceProps.ixx => Cuda.DeviceProps.ixx} |  0
 .../Cuda/{CudaError.ixx => Cuda.Error.ixx}    |  0
 .../{CudaHelpers.ixx => Cuda.Helpers.ixx}     |  0
 .../Cuda/{CudaMemory.ixx => Cuda.Memory.ixx}  |  0
 .../{CudaProfiler.ixx => Cuda.Profiler.ixx}   |  0
 Mila/Source/Dnn/Cuda/Cuda.ixx                 |  1 +
 ...der.ixx => Data.CategoryVectorEncoder.ixx} |  0
 ...ator.ixx => Data.CharDatasetGenerator.ixx} |  0
 .../{DataDataset.ixx => Data.Dataset.ixx}     |  0
 ...taDatasetType.ixx => Data.DatasetType.ixx} |  0
 Mila/Source/Dnn/Data/FileStream.ixx           | 29 --------
 ...scriptor.ixx => Dnn.DropoutDescriptor.ixx} |  0
 .../Dnn/{DnnModel.ixx => Dnn.Model.ixx}       |  0
 ...nModelBuilder.ixx => Dnn.ModelBuilder.ixx} |  0
 ...nModelOptions.ixx => Dnn.ModelOptions.ixx} |  0
 ...euralNetType.ixx => Dnn.NeuralNetType.ixx} |  0
 ...iptor.ixx => Dnn.RnnDataSetDescriptor.ixx} |  0
 ...lection.ixx => Dnn.RnnLayerCollection.ixx} |  0
 ...LinearLayer.ixx => Dnn.RnnLinearLayer.ixx} |  0
 .../Dnn/{DnnRnnModel.ixx => Dnn.RnnModel.ixx} |  0
 ...delOptions.ixx => Dnn.RnnModelOptions.ixx} |  0
 ...Descriptor.ixx => Dnn.RnnOpDescriptor.ixx} |  0
 ...ptor.ixx => Dnn.StateTensorDescriptor.ixx} |  0
 ...escriptor.ixx => Dnn.TensorDescriptor.ixx} |  0
 Mila/Source/Dnn/Dnn.ixx                       |  1 +
 Mila/Source/Mila.ixx                          |  4 +-
 Samples/MilaPackage/MilaPackage.vcxproj       |  4 +-
 Samples/MilaPackage/packages.config           |  2 +-
 41 files changed, 73 insertions(+), 103 deletions(-)
 rename Mila/Source/Dnn/CuDNN/{CudnnContext.ixx => CuDnn.Context.ixx} (100%)
 rename Mila/Source/Dnn/CuDNN/{CuDnnDescriptor.ixx => CuDnn.Descriptor.ixx} (100%)
 rename Mila/Source/Dnn/CuDNN/{CuDnnError.ixx => CuDnn.Error.ixx} (100%)
 rename Mila/Source/Dnn/CuDNN/{CuDnnHelpers.ixx => CuDnn.Helpers.ixx} (100%)
 rename Mila/Source/Dnn/CuDNN/{CuDnnOpaqueDescriptor.ixx => CuDnn.OpaqueDescriptor.ixx} (100%)
 rename Mila/Source/Dnn/CuDNN/{CuDnnOpaqueDescriptorType.ixx => CuDnn.OpaqueDescriptorType.ixx} (100%)
 rename Mila/Source/Dnn/CuDNN/{CuDnnOpaqueHandle.ixx => CuDnn.OpaqueHandle.ixx} (100%)
 rename Mila/Source/Dnn/CuDNN/{CuDnnStatus.ixx => CuDnn.Status.ixx} (100%)
 rename Mila/Source/Dnn/CuDNN/{CuDnnUtils.ixx => CuDnn.Utils.ixx} (100%)
 rename Mila/Source/Dnn/Cuda/{CudaDevice.ixx => Cuda.Device.ixx} (100%)
 rename Mila/Source/Dnn/Cuda/{CudaDeviceProps.ixx => Cuda.DeviceProps.ixx} (100%)
 rename Mila/Source/Dnn/Cuda/{CudaError.ixx => Cuda.Error.ixx} (100%)
 rename Mila/Source/Dnn/Cuda/{CudaHelpers.ixx => Cuda.Helpers.ixx} (100%)
 rename Mila/Source/Dnn/Cuda/{CudaMemory.ixx => Cuda.Memory.ixx} (100%)
 rename Mila/Source/Dnn/Cuda/{CudaProfiler.ixx => Cuda.Profiler.ixx} (100%)
 rename Mila/Source/Dnn/Data/{DataCategoryVectorEncoder.ixx => Data.CategoryVectorEncoder.ixx} (100%)
 rename Mila/Source/Dnn/Data/{DataCharDatasetGenerator.ixx => Data.CharDatasetGenerator.ixx} (100%)
 rename Mila/Source/Dnn/Data/{DataDataset.ixx => Data.Dataset.ixx} (100%)
 rename Mila/Source/Dnn/Data/{DataDatasetType.ixx => Data.DatasetType.ixx} (100%)
 delete mode 100644 Mila/Source/Dnn/Data/FileStream.ixx
 rename Mila/Source/Dnn/{DnnDropoutDescriptor.ixx => Dnn.DropoutDescriptor.ixx} (100%)
 rename Mila/Source/Dnn/{DnnModel.ixx => Dnn.Model.ixx} (100%)
 rename Mila/Source/Dnn/{DnnModelBuilder.ixx => Dnn.ModelBuilder.ixx} (100%)
 rename Mila/Source/Dnn/{DnnModelOptions.ixx => Dnn.ModelOptions.ixx} (100%)
 rename Mila/Source/Dnn/{DnnNeuralNetType.ixx => Dnn.NeuralNetType.ixx} (100%)
 rename Mila/Source/Dnn/{DnnRnnDataSetDescriptor.ixx => Dnn.RnnDataSetDescriptor.ixx} (100%)
 rename Mila/Source/Dnn/{DnnRnnLayerCollection.ixx => Dnn.RnnLayerCollection.ixx} (100%)
 rename Mila/Source/Dnn/{DnnRnnLinearLayer.ixx => Dnn.RnnLinearLayer.ixx} (100%)
 rename Mila/Source/Dnn/{DnnRnnModel.ixx => Dnn.RnnModel.ixx} (100%)
 rename Mila/Source/Dnn/{DnnRnnModelOptions.ixx => Dnn.RnnModelOptions.ixx} (100%)
 rename Mila/Source/Dnn/{DnnRnnOpDescriptor.ixx => Dnn.RnnOpDescriptor.ixx} (100%)
 rename Mila/Source/Dnn/{DnnStateTensorDescriptor.ixx => Dnn.StateTensorDescriptor.ixx} (100%)
 rename Mila/Source/Dnn/{DnnTensorDescriptor.ixx => Dnn.TensorDescriptor.ixx} (100%)

diff --git a/Mila/Mila.vcxproj b/Mila/Mila.vcxproj
index e553463..cc8eb25 100644
--- a/Mila/Mila.vcxproj
+++ b/Mila/Mila.vcxproj
@@ -21,49 +21,48 @@
     <ClCompile Include="Source\Dnn\Core\Core.Version.ixx" />
     <ClCompile Include="Source\Dnn\Core\Core.Logger.ixx" />
     <ClCompile Include="Source\Dnn\Cuda\Cuda.ixx" />
-    <ClCompile Include="Source\Dnn\Cuda\CudaDevice.ixx" />
-    <ClCompile Include="Source\Dnn\Cuda\CudaDeviceProps.ixx" />
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Device.ixx" />
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.DeviceProps.ixx" />
     <ClCompile Include="Source\Dnn\Cuda\CudaEnv.ixx" />
-    <ClCompile Include="Source\Dnn\Cuda\CudaError.ixx" />
-    <ClCompile Include="Source\Dnn\Cuda\CudaHelpers.ixx" />
-    <ClCompile Include="Source\Dnn\Cuda\CudaMemory.ixx" />
-    <ClCompile Include="Source\Dnn\Cuda\CudaProfiler.ixx" />
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Error.ixx" />
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Helpers.ixx" />
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Memory.ixx" />
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Profiler.ixx" />
     <ClCompile Include="Source\Dnn\Cuda\CudaStream.ixx" />
     <ClCompile Include="Source\Dnn\Cuda\CudaUniqueHandle.ixx" />
     <ClCompile Include="Source\Dnn\CuDNN\CuDnn.ixx" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnContext.ixx" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnDescriptor.ixx" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnError.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Context.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Descriptor.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Error.ixx" />
     <ClCompile Include="Source\Dnn\CuDNN\fp16_emu.cpp" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnHelpers.ixx" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueDescriptor.ixx" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueDescriptorType.ixx" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueHandle.ixx" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnStatus.ixx" />
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnUtils.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Helpers.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueDescriptor.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueDescriptorType.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueHandle.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Status.ixx" />
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Utils.ixx" />
     <ClCompile Include="Source\Dnn\Data\Data.ixx" />
-    <ClCompile Include="Source\Dnn\Data\DataDataset.ixx" />
+    <ClCompile Include="Source\Dnn\Data\Data.Dataset.ixx" />
     <ClCompile Include="Source\Dnn\Data\H5\DataH5DataTypeMapper.ixx" />
-    <ClCompile Include="Source\Dnn\DnnModel.ixx" />
-    <ClCompile Include="Source\Dnn\DnnModelBuilder.ixx" />
-    <ClCompile Include="Source\Dnn\DnnModelOptions.ixx" />
-    <ClCompile Include="Source\Dnn\DnnDropoutDescriptor.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.Model.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.ModelBuilder.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.ModelOptions.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.DropoutDescriptor.ixx" />
     <ClCompile Include="Source\Dnn\Dnn.ixx" />
-    <ClCompile Include="Source\Dnn\DnnNeuralNetType.ixx" />
-    <ClCompile Include="Source\Dnn\DnnRnnDataSetDescriptor.ixx" />
-    <ClCompile Include="Source\Dnn\DnnRnnLayerCollection.ixx" />
-    <ClCompile Include="Source\Dnn\DnnRnnLinearLayer.ixx" />
-    <ClCompile Include="Source\Dnn\DnnRnnModel.ixx" />
-    <ClCompile Include="Source\Dnn\DnnRnnModelOptions.ixx" />
-    <ClCompile Include="Source\Dnn\DnnRnnOpDescriptor.ixx" />
-    <ClCompile Include="Source\Dnn\DnnStateTensorDescriptor.ixx" />
-    <ClCompile Include="Source\Dnn\DnnTensorDescriptor.ixx" />
-    <ClCompile Include="Source\Dnn\Data\DataDatasetType.ixx" />
-    <ClCompile Include="Source\Dnn\Data\FileStream.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.NeuralNetType.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.RnnDataSetDescriptor.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.RnnLayerCollection.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.RnnLinearLayer.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.RnnModel.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.RnnModelOptions.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.RnnOpDescriptor.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.StateTensorDescriptor.ixx" />
+    <ClCompile Include="Source\Dnn\Dnn.TensorDescriptor.ixx" />
+    <ClCompile Include="Source\Dnn\Data\Data.DatasetType.ixx" />
     <ClCompile Include="Source\Dnn\Data\H5\DataH5DatasetReader.ixx" />
     <ClCompile Include="Source\Dnn\Data\H5\DataH5DatasetWriter.ixx" />
-    <ClCompile Include="Source\Dnn\Data\DataCategoryVectorEncoder.ixx" />
-    <ClCompile Include="Source\Dnn\Data\DataCharDatasetGenerator.ixx" />
+    <ClCompile Include="Source\Dnn\Data\Data.CategoryVectorEncoder.ixx" />
+    <ClCompile Include="Source\Dnn\Data\Data.CharDatasetGenerator.ixx" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Source\Dnn\CuDNN\fp16_emu.h" />
diff --git a/Mila/Mila.vcxproj.filters b/Mila/Mila.vcxproj.filters
index 4ee337b..f4d230a 100644
--- a/Mila/Mila.vcxproj.filters
+++ b/Mila/Mila.vcxproj.filters
@@ -32,55 +32,55 @@
     <ClCompile Include="Source\Dnn\CuDNN\CuDnn.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnContext.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Context.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnDescriptor.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Descriptor.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnError.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Error.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnHelpers.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Helpers.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueDescriptor.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueDescriptor.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueDescriptorType.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueDescriptorType.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueHandle.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueHandle.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnStatus.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Status.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\CuDNN\CuDnnUtils.ixx">
+    <ClCompile Include="Source\Dnn\CuDNN\CuDnn.Utils.ixx">
       <Filter>Dnn\CuDnn</Filter>
     </ClCompile>
     <ClCompile Include="Source\Dnn\Cuda\Cuda.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Cuda\CudaDevice.ixx">
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Device.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Cuda\CudaDeviceProps.ixx">
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.DeviceProps.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
     <ClCompile Include="Source\Dnn\Cuda\CudaEnv.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Cuda\CudaError.ixx">
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Error.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Cuda\CudaHelpers.ixx">
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Helpers.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Cuda\CudaMemory.ixx">
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Memory.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Cuda\CudaProfiler.ixx">
+    <ClCompile Include="Source\Dnn\Cuda\Cuda.Profiler.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
     <ClCompile Include="Source\Dnn\Cuda\CudaStream.ixx">
@@ -89,46 +89,46 @@
     <ClCompile Include="Source\Dnn\Cuda\CudaUniqueHandle.ixx">
       <Filter>Dnn\Cuda</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnModel.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.Model.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnModelBuilder.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.ModelBuilder.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnModelOptions.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.ModelOptions.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnDropoutDescriptor.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.DropoutDescriptor.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
     <ClCompile Include="Source\Dnn\Dnn.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnNeuralNetType.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.NeuralNetType.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnRnnDataSetDescriptor.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.RnnDataSetDescriptor.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnRnnLayerCollection.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.RnnLayerCollection.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnRnnLinearLayer.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.RnnLinearLayer.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnRnnModel.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.RnnModel.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnRnnModelOptions.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.RnnModelOptions.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnRnnOpDescriptor.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.RnnOpDescriptor.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnStateTensorDescriptor.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.StateTensorDescriptor.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\DnnTensorDescriptor.ixx">
+    <ClCompile Include="Source\Dnn\Dnn.TensorDescriptor.ixx">
       <Filter>Dnn</Filter>
     </ClCompile>
     <ClCompile Include="Source\Dnn\Data\H5\DataH5DatasetReader.ixx">
@@ -137,16 +137,13 @@
     <ClCompile Include="Source\Dnn\Data\H5\DataH5DatasetWriter.ixx">
       <Filter>Dnn\Data\H5</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Data\DataDatasetType.ixx">
+    <ClCompile Include="Source\Dnn\Data\Data.DatasetType.ixx">
       <Filter>Dnn\Data</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Data\FileStream.ixx">
+    <ClCompile Include="Source\Dnn\Data\Data.CategoryVectorEncoder.ixx">
       <Filter>Dnn\Data</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Data\DataCategoryVectorEncoder.ixx">
-      <Filter>Dnn\Data</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\Dnn\Data\DataCharDatasetGenerator.ixx">
+    <ClCompile Include="Source\Dnn\Data\Data.CharDatasetGenerator.ixx">
       <Filter>Dnn\Data</Filter>
     </ClCompile>
     <ClCompile Include="Source\Dnn\Core\Core.Version.ixx">
@@ -159,7 +156,7 @@
     <ClCompile Include="Source\Dnn\Data\H5\DataH5DataTypeMapper.ixx">
       <Filter>Dnn\Data\H5</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Dnn\Data\DataDataset.ixx">
+    <ClCompile Include="Source\Dnn\Data\Data.Dataset.ixx">
       <Filter>Dnn\Data</Filter>
     </ClCompile>
     <ClCompile Include="Source\Dnn\Data\Data.ixx" />
diff --git a/Mila/Source/Dnn/CuDNN/CudnnContext.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Context.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CudnnContext.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.Context.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnnDescriptor.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Descriptor.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CuDnnDescriptor.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.Descriptor.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnnError.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Error.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CuDnnError.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.Error.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnnHelpers.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Helpers.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CuDnnHelpers.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.Helpers.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnnOpaqueDescriptor.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.OpaqueDescriptor.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CuDnnOpaqueDescriptor.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.OpaqueDescriptor.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnnOpaqueDescriptorType.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.OpaqueDescriptorType.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CuDnnOpaqueDescriptorType.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.OpaqueDescriptorType.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnnOpaqueHandle.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.OpaqueHandle.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CuDnnOpaqueHandle.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.OpaqueHandle.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnnStatus.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Status.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CuDnnStatus.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.Status.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnnUtils.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Utils.ixx
similarity index 100%
rename from Mila/Source/Dnn/CuDNN/CuDnnUtils.ixx
rename to Mila/Source/Dnn/CuDNN/CuDnn.Utils.ixx
diff --git a/Mila/Source/Dnn/CuDNN/CuDnn.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.ixx
index f041e41..f95d242 100644
--- a/Mila/Source/Dnn/CuDNN/CuDnn.ixx
+++ b/Mila/Source/Dnn/CuDNN/CuDnn.ixx
@@ -19,13 +19,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-export module Cudnn;
+export module CuDnn;
 
 export import CuDnn.Context;
 export import CuDnn.Descriptor;
 export import CuDnn.Error;
 export import CuDnn.Helpers;
-export import CuDnn.Error;
 export import CuDnn.OpaqueDescriptor;
 export import CuDnn.OpaqueDescriptorType;
 export import CuDnn.OpaqueHandle;
diff --git a/Mila/Source/Dnn/Cuda/CudaDevice.ixx b/Mila/Source/Dnn/Cuda/Cuda.Device.ixx
similarity index 100%
rename from Mila/Source/Dnn/Cuda/CudaDevice.ixx
rename to Mila/Source/Dnn/Cuda/Cuda.Device.ixx
diff --git a/Mila/Source/Dnn/Cuda/CudaDeviceProps.ixx b/Mila/Source/Dnn/Cuda/Cuda.DeviceProps.ixx
similarity index 100%
rename from Mila/Source/Dnn/Cuda/CudaDeviceProps.ixx
rename to Mila/Source/Dnn/Cuda/Cuda.DeviceProps.ixx
diff --git a/Mila/Source/Dnn/Cuda/CudaError.ixx b/Mila/Source/Dnn/Cuda/Cuda.Error.ixx
similarity index 100%
rename from Mila/Source/Dnn/Cuda/CudaError.ixx
rename to Mila/Source/Dnn/Cuda/Cuda.Error.ixx
diff --git a/Mila/Source/Dnn/Cuda/CudaHelpers.ixx b/Mila/Source/Dnn/Cuda/Cuda.Helpers.ixx
similarity index 100%
rename from Mila/Source/Dnn/Cuda/CudaHelpers.ixx
rename to Mila/Source/Dnn/Cuda/Cuda.Helpers.ixx
diff --git a/Mila/Source/Dnn/Cuda/CudaMemory.ixx b/Mila/Source/Dnn/Cuda/Cuda.Memory.ixx
similarity index 100%
rename from Mila/Source/Dnn/Cuda/CudaMemory.ixx
rename to Mila/Source/Dnn/Cuda/Cuda.Memory.ixx
diff --git a/Mila/Source/Dnn/Cuda/CudaProfiler.ixx b/Mila/Source/Dnn/Cuda/Cuda.Profiler.ixx
similarity index 100%
rename from Mila/Source/Dnn/Cuda/CudaProfiler.ixx
rename to Mila/Source/Dnn/Cuda/Cuda.Profiler.ixx
diff --git a/Mila/Source/Dnn/Cuda/Cuda.ixx b/Mila/Source/Dnn/Cuda/Cuda.ixx
index bca0607..b2b7da5 100644
--- a/Mila/Source/Dnn/Cuda/Cuda.ixx
+++ b/Mila/Source/Dnn/Cuda/Cuda.ixx
@@ -26,4 +26,5 @@ export import Cuda.Error;
 export import Cuda.Helpers;
 export import Cuda.Device;
 export import Cuda.DeviceProps;
+export import Cuda.Memory;
 export import Cuda.Profiler;
diff --git a/Mila/Source/Dnn/Data/DataCategoryVectorEncoder.ixx b/Mila/Source/Dnn/Data/Data.CategoryVectorEncoder.ixx
similarity index 100%
rename from Mila/Source/Dnn/Data/DataCategoryVectorEncoder.ixx
rename to Mila/Source/Dnn/Data/Data.CategoryVectorEncoder.ixx
diff --git a/Mila/Source/Dnn/Data/DataCharDatasetGenerator.ixx b/Mila/Source/Dnn/Data/Data.CharDatasetGenerator.ixx
similarity index 100%
rename from Mila/Source/Dnn/Data/DataCharDatasetGenerator.ixx
rename to Mila/Source/Dnn/Data/Data.CharDatasetGenerator.ixx
diff --git a/Mila/Source/Dnn/Data/DataDataset.ixx b/Mila/Source/Dnn/Data/Data.Dataset.ixx
similarity index 100%
rename from Mila/Source/Dnn/Data/DataDataset.ixx
rename to Mila/Source/Dnn/Data/Data.Dataset.ixx
diff --git a/Mila/Source/Dnn/Data/DataDatasetType.ixx b/Mila/Source/Dnn/Data/Data.DatasetType.ixx
similarity index 100%
rename from Mila/Source/Dnn/Data/DataDatasetType.ixx
rename to Mila/Source/Dnn/Data/Data.DatasetType.ixx
diff --git a/Mila/Source/Dnn/Data/FileStream.ixx b/Mila/Source/Dnn/Data/FileStream.ixx
deleted file mode 100644
index 3d80e1f..0000000
--- a/Mila/Source/Dnn/Data/FileStream.ixx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Todd Thomson, Achilles Software.  All rights reserved.
- *
- * Please refer to the Mila end user license agreement (EULA) associated
- * with this source code for terms and conditions that govern your use of
- * this software. Any use, reproduction, disclosure, or distribution of
- * this software and related documentation outside the terms of the EULA
- * is strictly prohibited.
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-export module Dnn.Data.FileStream;
-
-namespace Mila::Dnn::Data
-{
-    export class FileStream
-    {
-    };
-}
\ No newline at end of file
diff --git a/Mila/Source/Dnn/DnnDropoutDescriptor.ixx b/Mila/Source/Dnn/Dnn.DropoutDescriptor.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnDropoutDescriptor.ixx
rename to Mila/Source/Dnn/Dnn.DropoutDescriptor.ixx
diff --git a/Mila/Source/Dnn/DnnModel.ixx b/Mila/Source/Dnn/Dnn.Model.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnModel.ixx
rename to Mila/Source/Dnn/Dnn.Model.ixx
diff --git a/Mila/Source/Dnn/DnnModelBuilder.ixx b/Mila/Source/Dnn/Dnn.ModelBuilder.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnModelBuilder.ixx
rename to Mila/Source/Dnn/Dnn.ModelBuilder.ixx
diff --git a/Mila/Source/Dnn/DnnModelOptions.ixx b/Mila/Source/Dnn/Dnn.ModelOptions.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnModelOptions.ixx
rename to Mila/Source/Dnn/Dnn.ModelOptions.ixx
diff --git a/Mila/Source/Dnn/DnnNeuralNetType.ixx b/Mila/Source/Dnn/Dnn.NeuralNetType.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnNeuralNetType.ixx
rename to Mila/Source/Dnn/Dnn.NeuralNetType.ixx
diff --git a/Mila/Source/Dnn/DnnRnnDataSetDescriptor.ixx b/Mila/Source/Dnn/Dnn.RnnDataSetDescriptor.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnRnnDataSetDescriptor.ixx
rename to Mila/Source/Dnn/Dnn.RnnDataSetDescriptor.ixx
diff --git a/Mila/Source/Dnn/DnnRnnLayerCollection.ixx b/Mila/Source/Dnn/Dnn.RnnLayerCollection.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnRnnLayerCollection.ixx
rename to Mila/Source/Dnn/Dnn.RnnLayerCollection.ixx
diff --git a/Mila/Source/Dnn/DnnRnnLinearLayer.ixx b/Mila/Source/Dnn/Dnn.RnnLinearLayer.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnRnnLinearLayer.ixx
rename to Mila/Source/Dnn/Dnn.RnnLinearLayer.ixx
diff --git a/Mila/Source/Dnn/DnnRnnModel.ixx b/Mila/Source/Dnn/Dnn.RnnModel.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnRnnModel.ixx
rename to Mila/Source/Dnn/Dnn.RnnModel.ixx
diff --git a/Mila/Source/Dnn/DnnRnnModelOptions.ixx b/Mila/Source/Dnn/Dnn.RnnModelOptions.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnRnnModelOptions.ixx
rename to Mila/Source/Dnn/Dnn.RnnModelOptions.ixx
diff --git a/Mila/Source/Dnn/DnnRnnOpDescriptor.ixx b/Mila/Source/Dnn/Dnn.RnnOpDescriptor.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnRnnOpDescriptor.ixx
rename to Mila/Source/Dnn/Dnn.RnnOpDescriptor.ixx
diff --git a/Mila/Source/Dnn/DnnStateTensorDescriptor.ixx b/Mila/Source/Dnn/Dnn.StateTensorDescriptor.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnStateTensorDescriptor.ixx
rename to Mila/Source/Dnn/Dnn.StateTensorDescriptor.ixx
diff --git a/Mila/Source/Dnn/DnnTensorDescriptor.ixx b/Mila/Source/Dnn/Dnn.TensorDescriptor.ixx
similarity index 100%
rename from Mila/Source/Dnn/DnnTensorDescriptor.ixx
rename to Mila/Source/Dnn/Dnn.TensorDescriptor.ixx
diff --git a/Mila/Source/Dnn/Dnn.ixx b/Mila/Source/Dnn/Dnn.ixx
index 803ff65..bac27c3 100644
--- a/Mila/Source/Dnn/Dnn.ixx
+++ b/Mila/Source/Dnn/Dnn.ixx
@@ -1,5 +1,6 @@
 export module Dnn;
 
+export import Dnn.RnnModel;
 export import Dnn.Model;
 export import Dnn.ModelBuilder;
 export import Dnn.ModelOptions;
diff --git a/Mila/Source/Mila.ixx b/Mila/Source/Mila.ixx
index 2779a42..98fba30 100644
--- a/Mila/Source/Mila.ixx
+++ b/Mila/Source/Mila.ixx
@@ -23,8 +23,10 @@ export module Mila;
 
 export import Core;
 export import Dnn;
+export import Data;
 
-//export import Mila.Cudnn;
+export import Cuda;
+export import CuDnn;
 
 export namespace Mila {
 
diff --git a/Samples/MilaPackage/MilaPackage.vcxproj b/Samples/MilaPackage/MilaPackage.vcxproj
index 619dcfa..bb6498b 100644
--- a/Samples/MilaPackage/MilaPackage.vcxproj
+++ b/Samples/MilaPackage/MilaPackage.vcxproj
@@ -86,12 +86,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Achilles.Mila.0.9.4-alpha\build\native\Achilles.Mila.targets" Condition="Exists('..\..\packages\Achilles.Mila.0.9.4-alpha\build\native\Achilles.Mila.targets')" />
+    <Import Project="..\..\packages\Achilles.Mila.0.9.5-alpha\build\native\Achilles.Mila.targets" Condition="Exists('..\..\packages\Achilles.Mila.0.9.5-alpha\build\native\Achilles.Mila.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Achilles.Mila.0.9.4-alpha\build\native\Achilles.Mila.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Achilles.Mila.0.9.4-alpha\build\native\Achilles.Mila.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Achilles.Mila.0.9.5-alpha\build\native\Achilles.Mila.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Achilles.Mila.0.9.5-alpha\build\native\Achilles.Mila.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Samples/MilaPackage/packages.config b/Samples/MilaPackage/packages.config
index 3104de1..c7c5443 100644
--- a/Samples/MilaPackage/packages.config
+++ b/Samples/MilaPackage/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Achilles.Mila" version="0.9.4-alpha" targetFramework="native" />
+  <package id="Achilles.Mila" version="0.9.5-alpha" targetFramework="native" />
 </packages>
\ No newline at end of file