Remove .Model namespace as it is unnecessary

src/DotTiled.Benchmark/Program.cs

@@ -35,7 +35,7 @@ namespace DotTiled.Benchmark
 
     [BenchmarkCategory("MapFromInMemoryTmxString")]
     [Benchmark(Baseline = true, Description = "DotTiled")]
-    public DotTiled.Model.Map LoadWithDotTiledFromInMemoryTmxString()
+    public DotTiled.Map LoadWithDotTiledFromInMemoryTmxString()
     {
       using var stringReader = new StringReader(_tmxContents);
       using var xmlReader = XmlReader.Create(stringReader);
@@ -45,7 +45,7 @@ namespace DotTiled.Benchmark
 
     [BenchmarkCategory("MapFromInMemoryTmjString")]
     [Benchmark(Baseline = true, Description = "DotTiled")]
-    public DotTiled.Model.Map LoadWithDotTiledFromInMemoryTmjString()
+    public DotTiled.Map LoadWithDotTiledFromInMemoryTmjString()
     {
       using var mapReader = new DotTiled.Serialization.Tmj.TmjMapReader(_tmjContents, _ => throw new NotSupportedException(), _ => throw new NotSupportedException(), _ => throw new NotSupportedException());
       return mapReader.ReadMap();

src/DotTiled.Tests/Assert/AssertData.cs

@@ -1,5 +1,3 @@
-using DotTiled.Model;
-
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Assert/AssertImage.cs

@@ -1,5 +1,3 @@
-using DotTiled.Model;
-
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Assert/AssertLayer.cs

@@ -1,5 +1,3 @@
-using DotTiled.Model;
-
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Assert/AssertMap.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Numerics;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Assert/AssertObject.cs

@@ -1,22 +1,22 @@
-using DotTiled.Model;
-
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert
 {
-  internal static void AssertObject(Model.Object expected, Model.Object actual)
+  internal static void AssertObject(DotTiled.Object expected, DotTiled.Object actual)
   {
     // Attributes
-    AssertEqual(expected.ID, actual.ID, nameof(Model.Object.ID));
-    AssertEqual(expected.Name, actual.Name, nameof(Model.Object.Name));
-    AssertEqual(expected.Type, actual.Type, nameof(Model.Object.Type));
-    AssertEqual(expected.X, actual.X, nameof(Model.Object.X));
-    AssertEqual(expected.Y, actual.Y, nameof(Model.Object.Y));
-    AssertEqual(expected.Width, actual.Width, nameof(Model.Object.Width));
-    AssertEqual(expected.Height, actual.Height, nameof(Model.Object.Height));
-    AssertEqual(expected.Rotation, actual.Rotation, nameof(Model.Object.Rotation));
-    AssertEqual(expected.Visible, actual.Visible, nameof(Model.Object.Visible));
-    AssertEqual(expected.Template, actual.Template, nameof(Model.Object.Template));
+#pragma warning disable IDE0002
+    AssertEqual(expected.ID, actual.ID, nameof(DotTiled.Object.ID));
+    AssertEqual(expected.Name, actual.Name, nameof(DotTiled.Object.Name));
+    AssertEqual(expected.Type, actual.Type, nameof(DotTiled.Object.Type));
+    AssertEqual(expected.X, actual.X, nameof(DotTiled.Object.X));
+    AssertEqual(expected.Y, actual.Y, nameof(DotTiled.Object.Y));
+    AssertEqual(expected.Width, actual.Width, nameof(DotTiled.Object.Width));
+    AssertEqual(expected.Height, actual.Height, nameof(DotTiled.Object.Height));
+    AssertEqual(expected.Rotation, actual.Rotation, nameof(DotTiled.Object.Rotation));
+    AssertEqual(expected.Visible, actual.Visible, nameof(DotTiled.Object.Visible));
+    AssertEqual(expected.Template, actual.Template, nameof(DotTiled.Object.Template));
+#pragma warning restore IDE0002
 
     AssertProperties(expected.Properties, actual.Properties);
 

src/DotTiled.Tests/Assert/AssertProperties.cs

@@ -1,5 +1,3 @@
-using DotTiled.Model;
-
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Assert/AssertTileset.cs

@@ -1,5 +1,3 @@
-using DotTiled.Model;
-
 namespace DotTiled.Tests;
 
 public static partial class DotTiledAssert

src/DotTiled.Tests/Serialization/MapReaderTests.cs

@@ -1,4 +1,3 @@
-using DotTiled.Model;
 using DotTiled.Serialization;
 
 namespace DotTiled.Tests;

src/DotTiled.Tests/Serialization/TestData.cs

@@ -1,5 +1,4 @@
 using System.Xml;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs

@@ -1,5 +1,3 @@
-using DotTiled.Model;
-
 namespace DotTiled.Tests;
 
 public partial class TestData

src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-deep-props/map-with-deep-props.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.cs

@@ -1,5 +1,4 @@
 using System.Numerics;
-using DotTiled.Model;
 
 namespace DotTiled.Tests;
 

src/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs

@@ -1,4 +1,3 @@
-using DotTiled.Model;
 using DotTiled.Serialization.Tmj;
 
 namespace DotTiled.Tests;

src/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs

@@ -1,4 +1,3 @@
-using DotTiled.Model;
 using DotTiled.Serialization.Tmx;
 
 namespace DotTiled.Tests;

src/DotTiled/Color.cs

@@ -2,7 +2,7 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a Tiled color.

src/DotTiled/Layers/BaseLayer.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Base class for all layer types in a map.

src/DotTiled/Layers/Data.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Specifies the encoding used to encode the tile layer data.

src/DotTiled/Layers/Group.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a group of layers, to form a hierarchy.

src/DotTiled/Layers/ImageLayer.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents an image layer in a map.

src/DotTiled/Layers/ObjectLayer.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents the order in which objects can be drawn.

src/DotTiled/Layers/Objects/EllipseObject.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// An ellipse object in a map. The existing <see cref="Object.X"/>, <see cref="Object.Y"/>, <see cref="Object.Width"/>,

src/DotTiled/Layers/Objects/Object.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Base class for objects in object layers.

src/DotTiled/Layers/Objects/PointObject.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// A point object in a map. The existing <see cref="Object.X"/> and <see cref="Object.Y"/> properties are used to

src/DotTiled/Layers/Objects/PolygonObject.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// A polygon object in a map. The existing <see cref="Object.X"/> and <see cref="Object.Y"/> properties are used as

src/DotTiled/Layers/Objects/PolylineObject.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// A polyline object in a map. The existing <see cref="Object.X"/> and <see cref="Object.Y"/> properties are used as

src/DotTiled/Layers/Objects/RectangleObject.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// A rectangle object in a map. The existing <see cref="Object.X"/>, <see cref="Object.Y"/>, <see cref="Object.Width"/>,

src/DotTiled/Layers/Objects/TextObject.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// The horizontal alignment of text.

src/DotTiled/Layers/Objects/TileObject.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// A tile object in a map.

src/DotTiled/Layers/TileLayer.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a tile layer in a map.

src/DotTiled/Map.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Map orientation enumeration. The map orientation determines the alignment of the tiles in the map.

src/DotTiled/Properties/BoolProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a boolean property.

src/DotTiled/Properties/ClassProperty.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a class property.
@@ -14,7 +14,7 @@ public class ClassProperty : IHasProperties, IProperty<IList<IProperty>>
   public required string Name { get; set; }
 
   /// <inheritdoc/>
-  public PropertyType Type => Model.PropertyType.Class;
+  public PropertyType Type => DotTiled.PropertyType.Class;
 
   /// <summary>
   /// The type of the class property. This will be the name of a custom defined

src/DotTiled/Properties/ColorProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a color property.

src/DotTiled/Properties/CustomTypes/CustomClassDefinition.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents the types of objects that can use a custom class.

src/DotTiled/Properties/CustomTypes/CustomEnumDefinition.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents the storage type of a custom enum.

src/DotTiled/Properties/CustomTypes/CustomTypeDefinition.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Base class for custom type definitions.

src/DotTiled/Properties/EnumProperty.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents an enum property.
@@ -12,7 +12,7 @@ public class EnumProperty : IProperty<ISet<string>>
   public required string Name { get; set; }
 
   /// <inheritdoc/>
-  public PropertyType Type => Model.PropertyType.Enum;
+  public PropertyType Type => DotTiled.PropertyType.Enum;
 
   /// <summary>
   /// The type of the class property. This will be the name of a custom defined

src/DotTiled/Properties/FileProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a file property.

src/DotTiled/Properties/FloatProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a float property.

src/DotTiled/Properties/IHasProperties.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Interface for objects that have properties attached to them.

src/DotTiled/Properties/IProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Interface for properties that can be attached to objects, tiles, tilesets, maps etc.

src/DotTiled/Properties/IntProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents an integer property.

src/DotTiled/Properties/ObjectProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents an object property.

src/DotTiled/Properties/PropertyType.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents the type of a property.

src/DotTiled/Properties/StringProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a string property.

src/DotTiled/Serialization/Helpers.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization;
 

src/DotTiled/Serialization/IMapReader.cs

@@ -1,5 +1,4 @@
 using System;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization;
 

src/DotTiled/Serialization/ITemplateReader.cs

@@ -1,5 +1,4 @@
 using System;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization;
 

src/DotTiled/Serialization/ITilesetReader.cs

@@ -1,5 +1,4 @@
 using System;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization;
 

src/DotTiled/Serialization/MapReader.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Xml;
-using DotTiled.Model;
 using DotTiled.Serialization.Tmj;
 using DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/TemplateReader.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Xml;
-using DotTiled.Model;
 using DotTiled.Serialization.Tmj;
 using DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/TilesetReader.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Xml;
-using DotTiled.Model;
 using DotTiled.Serialization.Tmj;
 using DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmj/TjTemplateReader.cs

@@ -1,5 +1,4 @@
 using System;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjMapReader.cs

@@ -1,5 +1,4 @@
 using System;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.Data.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.Group.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.ImageLayer.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.Layer.cs

@@ -1,5 +1,4 @@
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.Map.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.ObjectLayer.cs

@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 
@@ -34,7 +33,7 @@ public abstract partial class TmjReaderBase
       _ => throw new JsonException($"Unknown draw order '{s}'.")
     }, DrawOrder.TopDown);
 
-    var objects = element.GetOptionalPropertyCustom<List<Model.Object>>("objects", e => e.GetValueAsList<Model.Object>(el => ReadObject(el)), []);
+    var objects = element.GetOptionalPropertyCustom<List<DotTiled.Object>>("objects", e => e.GetValueAsList<DotTiled.Object>(el => ReadObject(el)), []);
 
     return new ObjectLayer
     {
@@ -59,7 +58,7 @@ public abstract partial class TmjReaderBase
     };
   }
 
-  internal Model.Object ReadObject(JsonElement element)
+  internal DotTiled.Object ReadObject(JsonElement element)
   {
     uint? idDefault = null;
     string nameDefault = "";

src/DotTiled/Serialization/Tmj/TmjReaderBase.Properties.cs

@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.Template.cs

@@ -1,5 +1,4 @@
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 
@@ -9,7 +8,7 @@ public abstract partial class TmjReaderBase
   {
     var type = element.GetRequiredProperty<string>("type");
     var tileset = element.GetOptionalPropertyCustom<Tileset?>("tileset", ReadTileset, null);
-    var @object = element.GetRequiredPropertyCustom<Model.Object>("object", ReadObject);
+    var @object = element.GetRequiredPropertyCustom<DotTiled.Object>("object", ReadObject);
 
     return new Template
     {

src/DotTiled/Serialization/Tmj/TmjReaderBase.TileLayer.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.Tileset.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TmjReaderBase.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Text.Json;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmj/TsjTilesetReader.cs

@@ -1,5 +1,4 @@
 using System;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmj;
 

src/DotTiled/Serialization/Tmx/TmxMapReader.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Xml;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmx/TmxReaderBase.Chunk.cs

@@ -1,5 +1,3 @@
-using DotTiled.Model;
-
 namespace DotTiled.Serialization.Tmx;
 
 public abstract partial class TmxReaderBase

src/DotTiled/Serialization/Tmx/TmxReaderBase.Data.cs

@@ -4,7 +4,6 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Xml;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmx/TmxReaderBase.Map.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmx/TmxReaderBase.ObjectLayer.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Numerics;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 
@@ -36,7 +35,7 @@ public abstract partial class TmxReaderBase
 
     // Elements
     List<IProperty>? properties = null;
-    List<Model.Object> objects = [];
+    List<DotTiled.Object> objects = [];
 
     _reader.ProcessChildren("objectgroup", (r, elementName) => elementName switch
     {
@@ -68,11 +67,11 @@ public abstract partial class TmxReaderBase
     };
   }
 
-  internal Model.Object ReadObject()
+  internal DotTiled.Object ReadObject()
   {
     // Attributes
     var template = _reader.GetOptionalAttribute("template");
-    Model.Object? obj = null;
+    DotTiled.Object? obj = null;
     if (template is not null)
       obj = _externalTemplateResolver(template).Object;
 
@@ -100,7 +99,7 @@ public abstract partial class TmxReaderBase
     var visible = _reader.GetOptionalAttributeParseable<bool>("visible") ?? visibleDefault;
 
     // Elements
-    Model.Object? foundObject = null;
+    DotTiled.Object? foundObject = null;
     int propertiesCounter = 0;
     List<IProperty>? properties = propertiesDefault;
 
@@ -138,7 +137,7 @@ public abstract partial class TmxReaderBase
     return OverrideObject(obj, foundObject);
   }
 
-  internal static Model.Object OverrideObject(Model.Object? obj, Model.Object foundObject)
+  internal static DotTiled.Object OverrideObject(DotTiled.Object? obj, DotTiled.Object foundObject)
   {
     if (obj is null)
       return foundObject;
@@ -305,7 +304,7 @@ public abstract partial class TmxReaderBase
     Tileset? tileset = null;
 
     // Should contain exactly one of
-    Model.Object? obj = null;
+    DotTiled.Object? obj = null;
 
     _reader.ProcessChildren("template", (r, elementName) => elementName switch
     {

src/DotTiled/Serialization/Tmx/TmxReaderBase.Properties.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmx/TmxReaderBase.TileLayer.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmx/TmxReaderBase.Tileset.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmx/TmxReaderBase.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Xml;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmx/TsxTilesetReader.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Xml;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Serialization/Tmx/TxTemplateReader.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Xml;
-using DotTiled.Model;
 
 namespace DotTiled.Serialization.Tmx;
 

src/DotTiled/Template.cs

@@ -1,7 +1,7 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
-/// Represents a Tiled template. A template is a reusable object that can be placed in an <see cref="DotTiled.Model"/> inside the Tiled editor.
+/// Represents a Tiled template. A template is a reusable object that can be placed in an <see cref="DotTiled"/> inside the Tiled editor.
 /// </summary>
 public class Template
 {

src/DotTiled/Tilesets/Frame.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// A single frame of an animated tile.

src/DotTiled/Tilesets/Grid.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Orientation of the grid for the tiles in this tileset.

src/DotTiled/Tilesets/Image.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// The format of an image.

src/DotTiled/Tilesets/Tile.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a single tile in a tileset, when using a collection of images to represent the tileset.

src/DotTiled/Tilesets/TileOffset.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Is used to specify an offset in pixels in tilesets, to be applied when drawing a tile from the related tileset.

src/DotTiled/Tilesets/Tileset.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// The alignment of tile objects.

src/DotTiled/Tilesets/Transformations.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents which transformations can be applied to a tile in a tileset.

src/DotTiled/Tilesets/WangColor.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a Wang color in a Wang set.

src/DotTiled/Tilesets/WangTile.cs

@@ -1,4 +1,4 @@
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Represents a Wang tile in a Wang set.

src/DotTiled/Tilesets/Wangset.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled.Model;
+namespace DotTiled;
 
 /// <summary>
 /// Defines a list of colors and any number of Wang tiles using these colors.