Refactored evaluation and uaccess dll namespaces

seb-eis · Oct 14, 2020 · 78d46fb · 78d46fb
1 parent 9a5b8f7
commit 78d46fb
Show file tree

Hide file tree

Showing 55 changed files with 51 additions and 39 deletions.
diff --git a/...nContext/Importer/IMmcfeResultImporter.cs → ...tion/Custom/Mmcfe/IMmcfeResultImporter.cs b/...nContext/Importer/IMmcfeResultImporter.cs → ...tion/Custom/Mmcfe/IMmcfeResultImporter.cs
@@ -2,7 +2,7 @@
 using System.Linq.Expressions;
 using Mocassin.Model.Translator.Database.Entities.Other.Meta;
 
-namespace Mocassin.Tools.Evaluation.Custom.Mmcfe.Importer
+namespace Mocassin.Tools.Evaluation.Custom.Mmcfe
 {
     /// <summary>
     ///     Represents an importer for populating <see cref="MmcfeLogCollectionDbContext" /> from raw simulation results

diff --git a/...tom/Mmcfe/Results/MmcfeEnergyDataPoint.cs → ...tion/Custom/Mmcfe/MmcfeEnergyDataPoint.cs b/...tom/Mmcfe/Results/MmcfeEnergyDataPoint.cs → ...tion/Custom/Mmcfe/MmcfeEnergyDataPoint.cs
diff --git a/...aluation/MmcfeEnergyDataPointEvaluator.cs → ...om/Mmcfe/MmcfeEnergyDataPointEvaluator.cs b/...aluation/MmcfeEnergyDataPointEvaluator.cs → ...om/Mmcfe/MmcfeEnergyDataPointEvaluator.cs
@@ -7,8 +7,8 @@
 using Microsoft.EntityFrameworkCore;
 using Mocassin.Framework.SQLiteCore;
 using Mocassin.Mathematics.Comparer;
+using Mocassin.Tools.Evaluation.Helper;
 using Mocassin.Tools.Evaluation.PlotData;
-using Mocassin.Tools.Evaluation.Queries.Base;
 
 namespace Mocassin.Tools.Evaluation.Custom.Mmcfe
 {

diff --git a/.../Mmcfe/Evaluation/MmcfeEnergyEvaluator.cs → ...tion/Custom/Mmcfe/MmcfeEnergyEvaluator.cs b/.../Mmcfe/Evaluation/MmcfeEnergyEvaluator.cs → ...tion/Custom/Mmcfe/MmcfeEnergyEvaluator.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Mocassin.Framework.Extensions;
-using Mocassin.Tools.Evaluation.Queries.Base;
+using Mocassin.Tools.Evaluation.Helper;
 using Mocassin.Tools.UAccess.Readers;
 
 namespace Mocassin.Tools.Evaluation.Custom.Mmcfe

diff --git a/.../Custom/Mmcfe/Results/MmcfeEnergyState.cs → ...aluation/Custom/Mmcfe/MmcfeEnergyState.cs b/.../Custom/Mmcfe/Results/MmcfeEnergyState.cs → ...aluation/Custom/Mmcfe/MmcfeEnergyState.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 using System.Text;
-using Mocassin.Tools.Evaluation.Queries.Base;
+using Mocassin.Tools.Evaluation.Helper;
 
 namespace Mocassin.Tools.Evaluation.Custom.Mmcfe
 {

diff --git a/...nContext/Context/MmcfeExtendedLogEntry.cs → ...ion/Custom/Mmcfe/MmcfeExtendedLogEntry.cs b/...nContext/Context/MmcfeExtendedLogEntry.cs → ...ion/Custom/Mmcfe/MmcfeExtendedLogEntry.cs
diff --git a/...ontext/Importer/MmcfeJobFolderImporter.cs → ...on/Custom/Mmcfe/MmcfeJobFolderImporter.cs b/...ontext/Importer/MmcfeJobFolderImporter.cs → ...on/Custom/Mmcfe/MmcfeJobFolderImporter.cs
diff --git a/...xt/Context/MmcfeLogCollectionDbContext.cs → ...stom/Mmcfe/MmcfeLogCollectionDbContext.cs b/...xt/Context/MmcfeLogCollectionDbContext.cs → ...stom/Mmcfe/MmcfeLogCollectionDbContext.cs
diff --git a/...Custom/Mmcfe/Context/MmcfeLogDbContext.cs → ...luation/Custom/Mmcfe/MmcfeLogDbContext.cs b/...Custom/Mmcfe/Context/MmcfeLogDbContext.cs → ...luation/Custom/Mmcfe/MmcfeLogDbContext.cs
diff --git a/...ionContext/Context/MmcfeLogEnergyEntry.cs → ...ation/Custom/Mmcfe/MmcfeLogEnergyEntry.cs b/...ionContext/Context/MmcfeLogEnergyEntry.cs → ...ation/Custom/Mmcfe/MmcfeLogEnergyEntry.cs
diff --git a/...ion/Custom/Mmcfe/Context/MmcfeLogEntry.cs → ....Evaluation/Custom/Mmcfe/MmcfeLogEntry.cs b/...ion/Custom/Mmcfe/Context/MmcfeLogEntry.cs → ....Evaluation/Custom/Mmcfe/MmcfeLogEntry.cs
diff --git a/...mcfe/Context/MmcfeLogEvaluationContext.cs → ...Custom/Mmcfe/MmcfeLogEvaluationContext.cs b/...mcfe/Context/MmcfeLogEvaluationContext.cs → ...Custom/Mmcfe/MmcfeLogEvaluationContext.cs
diff --git a/...ctionContext/Context/MmcfeLogMetaEntry.cs → ...luation/Custom/Mmcfe/MmcfeLogMetaEntry.cs b/...ctionContext/Context/MmcfeLogMetaEntry.cs → ...luation/Custom/Mmcfe/MmcfeLogMetaEntry.cs
diff --git a/...ools.Evaluation/Queries/Base/Equations.cs → ...ssin.Tools.Evaluation/Helper/Equations.cs b/...ools.Evaluation/Queries/Base/Equations.cs → ...ssin.Tools.Evaluation/Helper/Equations.cs
@@ -4,7 +4,7 @@
 using Mocassin.Mathematics.Extensions;
 using Mocassin.Mathematics.ValueTypes;
 
-namespace Mocassin.Tools.Evaluation.Queries.Base
+namespace Mocassin.Tools.Evaluation.Helper
 {
     /// <summary>
     ///     Provides equations to calculate physical properties required by the evaluation system

diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/MetaDataHelper.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/MetaDataHelper.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Linq;
+using Mocassin.Mathematics.ValueTypes;
 using Mocassin.Model.Translator.Database.Entities.Other.Meta;
 
 namespace Mocassin.Tools.Evaluation.Helper
 {
     /// <summary>
-    ///     Provides static methods that help with
+    ///     Provides static methods that help with <see cref="IJobMetaData"/>
     /// </summary>
     public static class MetaDataHelper
     {

diff --git a/...valuation/Queries/Base/UnitConversions.cs → ...ools.Evaluation/Helper/UnitConversions.cs b/...valuation/Queries/Base/UnitConversions.cs → ...ools.Evaluation/Helper/UnitConversions.cs
@@ -1,4 +1,4 @@
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Helper
 {
     /// <summary>
     ///     Stores the unit conversion information required to convert the internally used unit to typical SI representation

diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Mocassin.Tools.Evaluation.csproj b/src/ModelBuilder/Mocassin.Tools.Evaluation/Mocassin.Tools.Evaluation.csproj
@@ -17,10 +17,6 @@
     <ProjectReference Include="..\Mocassin.UI.Xml\Mocassin.UI.Data.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Queries\Special\Result\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>

diff --git a/...Queries/CellSiteCoordinationEvaluation.cs → ...Queries/CellSiteCoordinationEvaluation.cs b/...Queries/CellSiteCoordinationEvaluation.cs → ...Queries/CellSiteCoordinationEvaluation.cs
@@ -8,6 +8,7 @@
 using Mocassin.Symmetry.Analysis;
 using Mocassin.Tools.Evaluation.Context;
 using Mocassin.Tools.Evaluation.Extensions;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...Special/Queries/CubicOnsagerEvaluation.cs → ...luation/Queries/CubicOnsagerEvaluation.cs b/...Special/Queries/CubicOnsagerEvaluation.cs → ...luation/Queries/CubicOnsagerEvaluation.cs
@@ -3,7 +3,8 @@
 using System.Linq;
 using Mocassin.Model.Particles;
 using Mocassin.Tools.Evaluation.Context;
-using Mocassin.Tools.Evaluation.Queries.Base;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...ries/Counting/Result/CoordinationShell.cs → ...luation/Queries/Data/CoordinationShell.cs b/...ries/Counting/Result/CoordinationShell.cs → ...luation/Queries/Data/CoordinationShell.cs
@@ -1,6 +1,6 @@
 using Mocassin.Tools.Evaluation.PlotData;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Describes the results of a <see cref="SiteCoordination" /> for a single distance as a site coordination

diff --git a/...ries/Mobility/Result/EnsembleDiffusion.cs → ...luation/Queries/Data/EnsembleDiffusion.cs b/...ries/Mobility/Result/EnsembleDiffusion.cs → ...luation/Queries/Data/EnsembleDiffusion.cs
@@ -1,7 +1,7 @@
 using System;
 using Mocassin.Model.Particles;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Stores the simulation diffusion data of an <see cref="IParticle" /> ensemble

diff --git a/...s/Tracking/Result/EnsembleDisplacement.cs → ...tion/Queries/Data/EnsembleDisplacement.cs b/...s/Tracking/Result/EnsembleDisplacement.cs → ...tion/Queries/Data/EnsembleDisplacement.cs
@@ -2,7 +2,7 @@
 using Mocassin.Mathematics.ValueTypes;
 using Mocassin.Model.Particles;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Struct that describes the movement of a <see cref="IParticle" /> ensemble in cartesian coordinates

diff --git a/...n/Queries/Meta/Result/EnsembleMetaData.cs → ...aluation/Queries/Data/EnsembleMetaData.cs b/...n/Queries/Meta/Result/EnsembleMetaData.cs → ...aluation/Queries/Data/EnsembleMetaData.cs
@@ -1,7 +1,7 @@
 using System;
 using Mocassin.Model.Particles;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Stores meta information for an ensemble of simulation particles

diff --git a/...eries/Mobility/Result/EnsembleMobility.cs → ...aluation/Queries/Data/EnsembleMobility.cs b/...eries/Mobility/Result/EnsembleMobility.cs → ...aluation/Queries/Data/EnsembleMobility.cs
@@ -1,7 +1,7 @@
 using System;
 using Mocassin.Model.Particles;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Contains the mobility data for a <see cref="IParticle" /> ensemble

diff --git a/...es/Tracking/Result/GlobalTrackerResult.cs → ...ation/Queries/Data/GlobalTrackerResult.cs b/...es/Tracking/Result/GlobalTrackerResult.cs → ...ation/Queries/Data/GlobalTrackerResult.cs
@@ -1,7 +1,7 @@
 using System;
 using Mocassin.Model.Translator.ModelContext;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Struct that contains the <see cref="EnsembleDisplacement" /> of a <see cref="IGlobalTrackerModel" />

diff --git a/...on/Queries/Meta/Result/LatticeMetaData.cs → ...valuation/Queries/Data/LatticeMetaData.cs b/...on/Queries/Meta/Result/LatticeMetaData.cs → ...valuation/Queries/Data/LatticeMetaData.cs
@@ -1,6 +1,6 @@
 using Mocassin.Mathematics.ValueTypes;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Stores the meta information for a single the simulation lattice

diff --git a/...es/Tracking/Result/MobileTrackerResult.cs → ...ation/Queries/Data/MobileTrackerResult.cs b/...es/Tracking/Result/MobileTrackerResult.cs → ...ation/Queries/Data/MobileTrackerResult.cs
@@ -2,7 +2,7 @@
 using Mocassin.Mathematics.ValueTypes;
 using Mocassin.Model.Particles;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Struct that contains the tracking data of a single mobile <see cref="IParticle" />

diff --git a/...eries/Counting/Result/SiteCoordination.cs → ...aluation/Queries/Data/SiteCoordination.cs b/...eries/Counting/Result/SiteCoordination.cs → ...aluation/Queries/Data/SiteCoordination.cs
@@ -4,7 +4,7 @@
 using Mocassin.Symmetry.Analysis;
 using Mocassin.Tools.Evaluation.PlotData;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Describes a radial distribution around a position in the lattice as a set of <see cref="CoordinationShell" /> items

diff --git a/...es/Tracking/Result/StaticTrackerResult.cs → ...ation/Queries/Data/StaticTrackerResult.cs b/...es/Tracking/Result/StaticTrackerResult.cs → ...ation/Queries/Data/StaticTrackerResult.cs
@@ -2,7 +2,7 @@
 using Mocassin.Mathematics.ValueTypes;
 using Mocassin.Model.Particles;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Stores the static tracking result of a single <see cref="IParticle" /> on a specific position id

diff --git a/...ies/Mobility/Result/TransitionMobility.cs → ...uation/Queries/Data/TransitionMobility.cs b/...ies/Mobility/Result/TransitionMobility.cs → ...uation/Queries/Data/TransitionMobility.cs
@@ -1,7 +1,7 @@
 using System;
 using Mocassin.Model.Translator.ModelContext;
 
-namespace Mocassin.Tools.Evaluation.Queries
+namespace Mocassin.Tools.Evaluation.Queries.Data
 {
     /// <summary>
     ///     Stores the transition resolved mobility data for a <see cref="IGlobalTrackerModel" />

diff --git a/...ty/Queries/EnsembleDiffusionEvaluation.cs → ...on/Queries/EnsembleDiffusionEvaluation.cs b/...ty/Queries/EnsembleDiffusionEvaluation.cs → ...on/Queries/EnsembleDiffusionEvaluation.cs
@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Mocassin.Tools.Evaluation.Context;
-using Mocassin.Tools.Evaluation.Queries.Base;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...Queries/EnsembleDisplacementEvaluation.cs → ...Queries/EnsembleDisplacementEvaluation.cs b/...Queries/EnsembleDisplacementEvaluation.cs → ...Queries/EnsembleDisplacementEvaluation.cs
@@ -6,6 +6,8 @@
 using Mocassin.Model.Particles;
 using Mocassin.Tools.Evaluation.Context;
 using Mocassin.Tools.Evaluation.Extensions;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...es/Meta/Queries/EnsembleMetaEvaluation.cs → ...luation/Queries/EnsembleMetaEvaluation.cs b/...es/Meta/Queries/EnsembleMetaEvaluation.cs → ...luation/Queries/EnsembleMetaEvaluation.cs
@@ -3,6 +3,7 @@
 using Mocassin.Model.Particles;
 using Mocassin.Tools.Evaluation.Context;
 using Mocassin.Tools.Evaluation.Extensions;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...ity/Queries/EnsembleMobilityEvaluation.cs → ...ion/Queries/EnsembleMobilityEvaluation.cs b/...ity/Queries/EnsembleMobilityEvaluation.cs → ...ion/Queries/EnsembleMobilityEvaluation.cs
@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Mocassin.Tools.Evaluation.Context;
-using Mocassin.Tools.Evaluation.Queries.Base;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...cking/Queries/GlobalTrackingEvaluation.cs → ...ation/Queries/GlobalTrackingEvaluation.cs b/...cking/Queries/GlobalTrackingEvaluation.cs → ...ation/Queries/GlobalTrackingEvaluation.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using Mocassin.Tools.Evaluation.Context;
 using Mocassin.Tools.Evaluation.Extensions;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...ies/Meta/Queries/LatticeMetaEvaluation.cs → ...aluation/Queries/LatticeMetaEvaluation.cs b/...ies/Meta/Queries/LatticeMetaEvaluation.cs → ...aluation/Queries/LatticeMetaEvaluation.cs
@@ -3,6 +3,8 @@
 using Mocassin.Mathematics.ValueTypes;
 using Mocassin.Tools.Evaluation.Context;
 using Mocassin.Tools.Evaluation.Extensions;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...ueries/LocalSiteCoordinationEvaluation.cs → ...ueries/LocalSiteCoordinationEvaluation.cs b/...ueries/LocalSiteCoordinationEvaluation.cs → ...ueries/LocalSiteCoordinationEvaluation.cs
@@ -8,6 +8,7 @@
 using Mocassin.Symmetry.Analysis;
 using Mocassin.Tools.Evaluation.Context;
 using Mocassin.Tools.Evaluation.Extensions;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...ing/Queries/LocalSiteDensityEvaluation.cs → ...ion/Queries/LocalSiteDensityEvaluation.cs b/...ing/Queries/LocalSiteDensityEvaluation.cs → ...ion/Queries/LocalSiteDensityEvaluation.cs
diff --git a/...cking/Queries/MobileTrackingEvaluation.cs → ...ation/Queries/MobileTrackingEvaluation.cs b/...cking/Queries/MobileTrackingEvaluation.cs → ...ation/Queries/MobileTrackingEvaluation.cs
@@ -2,6 +2,8 @@
 using Mocassin.Model.Particles;
 using Mocassin.Tools.Evaluation.Context;
 using Mocassin.Tools.Evaluation.Extensions;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...unting/Queries/ParticleCountEvaluation.cs → ...uation/Queries/ParticleCountEvaluation.cs b/...unting/Queries/ParticleCountEvaluation.cs → ...uation/Queries/ParticleCountEvaluation.cs
diff --git a/...ting/Queries/SiteEnvironmentEvaluation.cs → ...tion/Queries/SiteEnvironmentEvaluation.cs b/...ting/Queries/SiteEnvironmentEvaluation.cs → ...tion/Queries/SiteEnvironmentEvaluation.cs
diff --git a/.../Queries/SquaredDisplacementEvaluation.cs → .../Queries/SquaredDisplacementEvaluation.cs b/.../Queries/SquaredDisplacementEvaluation.cs → .../Queries/SquaredDisplacementEvaluation.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Mocassin.Mathematics.ValueTypes;
 using Mocassin.Tools.Evaluation.Context;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...cking/Queries/StaticTrackingEvaluation.cs → ...ation/Queries/StaticTrackingEvaluation.cs b/...cking/Queries/StaticTrackingEvaluation.cs → ...ation/Queries/StaticTrackingEvaluation.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Mocassin.Tools.Evaluation.Context;
 using Mocassin.Tools.Evaluation.Extensions;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...y/Queries/TransitionMobilityEvaluation.cs → ...n/Queries/TransitionMobilityEvaluation.cs b/...y/Queries/TransitionMobilityEvaluation.cs → ...n/Queries/TransitionMobilityEvaluation.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Mocassin.Tools.Evaluation.Context;
-using Mocassin.Tools.Evaluation.Queries.Base;
+using Mocassin.Tools.Evaluation.Helper;
+using Mocassin.Tools.Evaluation.Queries.Data;
 
 namespace Mocassin.Tools.Evaluation.Queries
 {

diff --git a/...ess/Readers/Base/BinaryStructureReader.cs → ....UAccess/Readers/BinaryStructureReader.cs b/...ess/Readers/Base/BinaryStructureReader.cs → ....UAccess/Readers/BinaryStructureReader.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace Mocassin.Tools.UAccess.Readers.Base
+namespace Mocassin.Tools.UAccess.Readers
 {
     /// <summary>
     ///     Provides generic read only reference access to structure contents of a byte buffer

diff --git a/...ader/Components/DynamicHistogramHeader.cs → ...ss/Readers/Data/DynamicHistogramHeader.cs b/...ader/Components/DynamicHistogramHeader.cs → ...ss/Readers/Data/DynamicHistogramHeader.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Mocassin.Tools.UAccess.Readers.HistogramReader.Components
+namespace Mocassin.Tools.UAccess.Readers.Data
 {
     /// <summary>
     ///     Header of a single dynamic size histogram struct of the 'C' Simulator

diff --git a/...s/McsReader/Components/McsCycleCounter.cs → ...s.UAccess/Readers/Data/McsCycleCounter.cs b/...s/McsReader/Components/McsCycleCounter.cs → ...s.UAccess/Readers/Data/McsCycleCounter.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Mocassin.Tools.UAccess.Readers.McsReader.Components
+namespace Mocassin.Tools.UAccess.Readers.Data
 {
     /// <summary>
     ///     Simulation state counter collection struct that contains cycle counters of a single species of a 'C' Simulator

diff --git a/...Readers/McsReader/Components/McsHeader.cs → ...n.Tools.UAccess/Readers/Data/McsHeader.cs b/...Readers/McsReader/Components/McsHeader.cs → ...n.Tools.UAccess/Readers/Data/McsHeader.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Mocassin.Tools.UAccess.Readers.McsReader.Components
+namespace Mocassin.Tools.UAccess.Readers.Data
 {
     /// <summary>
     ///     Simulation state header struct that provides build information about a 'C' Simulator state file

diff --git a/.../McsReader/Components/McsJumpHistogram.cs → ....UAccess/Readers/Data/McsJumpHistogram.cs b/.../McsReader/Components/McsJumpHistogram.cs → ....UAccess/Readers/Data/McsJumpHistogram.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Mocassin.Tools.UAccess.Readers.McsReader.Components
+namespace Mocassin.Tools.UAccess.Readers.Data
 {
     /// <summary>
     ///     Simulation jump histogram struct that contains the jump occurence sampling. Layout 'C' Simulator state file

diff --git a/.../McsReader/Components/McsJumpStatistic.cs → ....UAccess/Readers/Data/McsJumpStatistic.cs b/.../McsReader/Components/McsJumpStatistic.cs → ....UAccess/Readers/Data/McsJumpStatistic.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Mocassin.Tools.UAccess.Readers.McsReader.Components
+namespace Mocassin.Tools.UAccess.Readers.Data
 {
     /// <summary>
     ///     Simulation jump histogram struct that contains energy histogram data from a 'C' Simulator state file

diff --git a/...aders/McsReader/Components/McsMetaData.cs → ...Tools.UAccess/Readers/Data/McsMetaData.cs b/...aders/McsReader/Components/McsMetaData.cs → ...Tools.UAccess/Readers/Data/McsMetaData.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Mocassin.Tools.UAccess.Readers.McsReader.Components
+namespace Mocassin.Tools.UAccess.Readers.Data
 {
     /// <summary>
     ///     Simulation state meta data struct that contains the meta information of a 'C' Simulator state file

diff --git a/...csReader/Components/McsMovementTracker.cs → ...Access/Readers/Data/McsMovementTracker.cs b/...csReader/Components/McsMovementTracker.cs → ...Access/Readers/Data/McsMovementTracker.cs
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 using Mocassin.Mathematics.ValueTypes;
 
-namespace Mocassin.Tools.UAccess.Readers.McsReader.Components
+namespace Mocassin.Tools.UAccess.Readers.Data
 {
     /// <summary>
     ///     Simulation state movement tracker struct that stores a fractional movement information within the 'C' simulation

diff --git a/...HistogramReader/DynamicHistogramReader.cs → ...UAccess/Readers/DynamicHistogramReader.cs b/...HistogramReader/DynamicHistogramReader.cs → ...UAccess/Readers/DynamicHistogramReader.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Mocassin.Tools.UAccess.Readers.Base;
-using Mocassin.Tools.UAccess.Readers.HistogramReader.Components;
+using Mocassin.Tools.UAccess.Readers.Data;
 
 namespace Mocassin.Tools.UAccess.Readers
 {

diff --git a/...ess/Readers/McsReader/McsContentReader.cs → ...Tools.UAccess/Readers/McsContentReader.cs b/...ess/Readers/McsReader/McsContentReader.cs → ...Tools.UAccess/Readers/McsContentReader.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
-using Mocassin.Tools.UAccess.Readers.Base;
-using Mocassin.Tools.UAccess.Readers.McsReader.Components;
+using Mocassin.Tools.UAccess.Readers.Data;
 
 namespace Mocassin.Tools.UAccess.Readers
 {

diff --git a/...ess/Readers/MmcfeReader/MmcfeLogReader.cs → ...n.Tools.UAccess/Readers/MmcfeLogReader.cs b/...ess/Readers/MmcfeReader/MmcfeLogReader.cs → ...n.Tools.UAccess/Readers/MmcfeLogReader.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
 using Mocassin.Model.Translator.Routines;
-using Mocassin.Tools.UAccess.Readers.Base;
 
 namespace Mocassin.Tools.UAccess.Readers
 {