Use folder structure namespaces

Makefile

@@ -1,5 +1,5 @@
 test:
-	dotnet test
+	dotnet test src/DotTiled.sln
 
 BENCHMARK_SOURCES = DotTiled.Benchmark/Program.cs DotTiled.Benchmark/DotTiled.Benchmark.csproj
 BENCHMARK_OUTPUTDIR = DotTiled.Benchmark/BenchmarkDotNet.Artifacts

src/DotTiled.Tests/Assert/AssertData.cs

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

src/DotTiled.Tests/Assert/AssertImage.cs

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

src/DotTiled.Tests/Assert/AssertLayer.cs

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

src/DotTiled.Tests/Assert/AssertMap.cs

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

src/DotTiled.Tests/Assert/AssertObject.cs

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

src/DotTiled.Tests/Assert/AssertProperties.cs

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

src/DotTiled.Tests/Assert/AssertTileset.cs

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

src/DotTiled.Tests/Serialization/TestData.cs

@@ -1,4 +1,6 @@
 using System.Xml;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
 namespace DotTiled.Tests;
 

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

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

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

@@ -1,4 +1,8 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

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

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

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

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
 
 namespace DotTiled.Tests;
 

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

@@ -1,4 +1,8 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
 namespace DotTiled.Tests;
 

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

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

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

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

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

@@ -1,4 +1,7 @@
 using System.Globalization;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

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

@@ -1,4 +1,9 @@
 using System.Numerics;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Layers.Objects;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Tilesets;
 
 namespace DotTiled.Tests;
 

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

@@ -1,3 +1,8 @@
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
+using DotTiled.Serialization.Tmj;
+
 namespace DotTiled.Tests;
 
 public partial class TmjMapReaderTests

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

@@ -1,4 +1,8 @@
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
+using DotTiled.Serialization.Tmx;
 
 namespace DotTiled.Tests;
 

src/DotTiled/Model/Color.cs

@@ -2,7 +2,7 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
-namespace DotTiled;
+namespace DotTiled.Model;
 
 public class Color : IParsable<Color>, IEquatable<Color>
 {

src/DotTiled/Model/Layers/BaseLayer.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using DotTiled.Model.Properties;
 
-namespace DotTiled;
+namespace DotTiled.Model.Layers;
 
 public abstract class BaseLayer
 {

src/DotTiled/Model/Layers/Data.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace DotTiled;
+namespace DotTiled.Model.Layers;
 
 public enum DataEncoding
 {

src/DotTiled/Model/Layers/Group.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled;
+namespace DotTiled.Model.Layers;
 
 public class Group : BaseLayer
 {

src/DotTiled/Model/Layers/ImageLayer.cs

@@ -1,4 +1,6 @@
-namespace DotTiled;
+using DotTiled.Model.Tilesets;
+
+namespace DotTiled.Model.Layers;
 
 public class ImageLayer : BaseLayer
 {

src/DotTiled/Model/Layers/ObjectLayer.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using DotTiled.Model.Layers.Objects;
 
-namespace DotTiled;
+namespace DotTiled.Model.Layers;
 
 public enum DrawOrder
 {

src/DotTiled/Model/Layers/Objects/EllipseObject.cs

@@ -1,3 +1,3 @@
-namespace DotTiled;
+namespace DotTiled.Model.Layers.Objects;
 
 public class EllipseObject : Object { }

src/DotTiled/Model/Layers/Objects/Object.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using DotTiled.Model.Properties;
 
-namespace DotTiled;
+namespace DotTiled.Model.Layers.Objects;
 
 public abstract class Object
 {

src/DotTiled/Model/Layers/Objects/PointObject.cs

@@ -1,3 +1,3 @@
-namespace DotTiled;
+namespace DotTiled.Model.Layers.Objects;
 
 public class PointObject : Object { }

src/DotTiled/Model/Layers/Objects/PolygonObject.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace DotTiled;
+namespace DotTiled.Model.Layers.Objects;
 
 public class PolygonObject : Object
 {

src/DotTiled/Model/Layers/Objects/PolylineObject.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace DotTiled;
+namespace DotTiled.Model.Layers.Objects;
 
 public class PolylineObject : Object
 {

src/DotTiled/Model/Layers/Objects/RectangleObject.cs

@@ -1,3 +1,3 @@
-namespace DotTiled;
+namespace DotTiled.Model.Layers.Objects;
 
 public class RectangleObject : Object { }

src/DotTiled/Model/Layers/Objects/TextObject.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace DotTiled;
+namespace DotTiled.Model.Layers.Objects;
 
 
 public enum TextHorizontalAlignment

src/DotTiled/Model/Layers/Objects/TileObject.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Layers.Objects;
 
 public class TileObject : Object
 {

src/DotTiled/Model/Layers/TileLayer.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Layers;
 
 public class TileLayer : BaseLayer
 {

src/DotTiled/Model/Map.cs

@@ -1,7 +1,10 @@
 using System.Collections.Generic;
 using System.Globalization;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Model;
 
 public enum MapOrientation
 {

src/DotTiled/Model/Properties/BoolProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public class BoolProperty : IProperty
 {

src/DotTiled/Model/Properties/ClassProperty.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public class ClassProperty : IProperty
 {
   public required string Name { get; set; }
-  public PropertyType Type => DotTiled.PropertyType.Class;
+  public PropertyType Type => Model.Properties.PropertyType.Class;
   public required string PropertyType { get; set; }
   public required Dictionary<string, IProperty> Properties { get; set; }
 

src/DotTiled/Model/Properties/ColorProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public class ColorProperty : IProperty
 {

src/DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace DotTiled;
+namespace DotTiled.Model.Properties.CustomTypes;
 
 [Flags]
 public enum CustomClassUseAs

src/DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DotTiled;
+namespace DotTiled.Model.Properties.CustomTypes;
 
 public enum CustomEnumStorageType
 {

src/DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties.CustomTypes;
 
 public abstract class CustomTypeDefinition
 {

src/DotTiled/Model/Properties/FileProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public class FileProperty : IProperty
 {

src/DotTiled/Model/Properties/FloatProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public class FloatProperty : IProperty
 {

src/DotTiled/Model/Properties/IProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public interface IProperty
 {

src/DotTiled/Model/Properties/IntProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public class IntProperty : IProperty
 {

src/DotTiled/Model/Properties/ObjectProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public class ObjectProperty : IProperty
 {

src/DotTiled/Model/Properties/PropertyType.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public enum PropertyType
 {

src/DotTiled/Model/Properties/StringProperty.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Properties;
 
 public class StringProperty : IProperty
 {

src/DotTiled/Model/Template.cs

@@ -1,4 +1,7 @@
-namespace DotTiled;
+using DotTiled.Model.Layers.Objects;
+using DotTiled.Model.Tilesets;
+
+namespace DotTiled.Model;
 
 public class Template
 {

src/DotTiled/Model/Tilesets/Frame.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public class Frame
 {

src/DotTiled/Model/Tilesets/Grid.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public enum GridOrientation
 {

src/DotTiled/Model/Tilesets/Image.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public enum ImageFormat
 {

src/DotTiled/Model/Tilesets/Tile.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
 
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public class Tile
 {

src/DotTiled/Model/Tilesets/TileOffset.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public class TileOffset
 {

src/DotTiled/Model/Tilesets/Tileset.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using DotTiled.Model.Properties;
 
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public enum ObjectAlignment
 {

src/DotTiled/Model/Tilesets/Transformations.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public class Transformations
 {

src/DotTiled/Model/Tilesets/WangColor.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using DotTiled.Model.Properties;
 
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public class WangColor
 {

src/DotTiled/Model/Tilesets/WangTile.cs

@@ -1,4 +1,4 @@
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public class WangTile
 {

src/DotTiled/Model/Tilesets/Wangset.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using DotTiled.Model.Properties;
 
-namespace DotTiled;
+namespace DotTiled.Model.Tilesets;
 
 public class Wangset
 {

src/DotTiled/Serialization/Helpers.cs

@@ -3,8 +3,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization;
 
 internal static partial class Helpers
 {

src/DotTiled/Serialization/IMapReader.cs

@@ -1,6 +1,7 @@
 using System;
+using DotTiled.Model;
 
-namespace DotTiled;
+namespace DotTiled.Serialization;
 
 public interface IMapReader : IDisposable
 {

src/DotTiled/Serialization/ITemplateReader.cs

@@ -1,6 +1,7 @@
 using System;
+using DotTiled.Model;
 
-namespace DotTiled;
+namespace DotTiled.Serialization;
 
 public interface ITemplateReader : IDisposable
 {

src/DotTiled/Serialization/ITilesetReader.cs

@@ -1,6 +1,7 @@
 using System;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization;
 
 public interface ITilesetReader : IDisposable
 {

src/DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text.Json;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal static class ExtensionsJsonElement
 {

src/DotTiled/Serialization/Tmj/TjTemplateReader.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 public class TjTemplateReader : ITemplateReader
 {

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

@@ -5,8 +5,9 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text.Json;
+using DotTiled.Model.Layers;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {

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

@@ -3,8 +3,12 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {

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

@@ -3,8 +3,13 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {

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

@@ -3,8 +3,11 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties.CustomTypes;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {

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

@@ -4,8 +4,13 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {

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

@@ -3,8 +3,13 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Layers.Objects;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {
@@ -37,7 +42,7 @@ internal partial class Tmj
       _ => throw new JsonException($"Unknown draw order '{s}'.")
     }, DrawOrder.TopDown);
 
-    var objects = element.GetOptionalPropertyCustom<List<Object>>("objects", e => e.GetValueAsList<Object>(el => ReadObject(el, externalTemplateResolver, customTypeDefinitions)), []);
+    var objects = element.GetOptionalPropertyCustom<List<Model.Layers.Objects.Object>>("objects", e => e.GetValueAsList<Model.Layers.Objects.Object>(el => ReadObject(el, externalTemplateResolver, customTypeDefinitions)), []);
 
     return new ObjectLayer
     {
@@ -62,7 +67,7 @@ internal partial class Tmj
     };
   }
 
-  internal static Object ReadObject(
+  internal static Model.Layers.Objects.Object ReadObject(
     JsonElement element,
     Func<string, Template> externalTemplateResolver,
     IReadOnlyCollection<CustomTypeDefinition> customTypeDefinitions)

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

@@ -3,8 +3,11 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {

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

@@ -3,8 +3,11 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {
@@ -16,7 +19,7 @@ internal partial class Tmj
   {
     var type = element.GetRequiredProperty<string>("type");
     var tileset = element.GetOptionalPropertyCustom<Tileset?>("tileset", el => ReadTileset(el, externalTilesetResolver, externalTemplateResolver, customTypeDefinitions), null);
-    var @object = element.GetRequiredPropertyCustom<Object>("object", el => ReadObject(el, externalTemplateResolver, customTypeDefinitions));
+    var @object = element.GetRequiredPropertyCustom<Model.Layers.Objects.Object>("object", el => ReadObject(el, externalTemplateResolver, customTypeDefinitions));
 
     return new Template
     {

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

@@ -3,12 +3,15 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {
-
   internal static TileLayer ReadTileLayer(
     JsonElement element,
     IReadOnlyCollection<CustomTypeDefinition> customTypeDefinitions)

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

@@ -5,8 +5,13 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 internal partial class Tmj
 {

src/DotTiled/Serialization/Tmj/Tmj.Wangset.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Text.Json;
-
-namespace DotTiled;
-
-internal partial class Tmj
-{
-}

src/DotTiled/Serialization/Tmj/TmjMapReader.cs

@@ -3,8 +3,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.Json;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 public class TmjMapReader : IMapReader
 {

src/DotTiled/Serialization/Tmj/TsjTilesetReader.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmj;
 
 public class TsjTilesetReader : ITilesetReader
 {

src/DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs

@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Xml;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 internal static class ExtensionsXmlReader
 {

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

@@ -1,6 +1,7 @@
 using System.Xml;
+using DotTiled.Model.Layers;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 internal partial class Tmx
 {

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

@@ -4,8 +4,9 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Xml;
+using DotTiled.Model.Layers;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 internal partial class Tmx
 {

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

@@ -3,8 +3,13 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 internal partial class Tmx
 {

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

@@ -4,8 +4,14 @@ using System.Globalization;
 using System.Linq;
 using System.Numerics;
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Layers.Objects;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 internal partial class Tmx
 {
@@ -39,7 +45,7 @@ internal partial class Tmx
 
     // Elements
     Dictionary<string, IProperty>? properties = null;
-    List<Object> objects = [];
+    List<Model.Layers.Objects.Object> objects = [];
 
     reader.ProcessChildren("objectgroup", (r, elementName) => elementName switch
     {
@@ -71,14 +77,14 @@ internal partial class Tmx
     };
   }
 
-  internal static Object ReadObject(
+  internal static Model.Layers.Objects.Object ReadObject(
     XmlReader reader,
     Func<string, Template> externalTemplateResolver,
     IReadOnlyCollection<CustomTypeDefinition> customTypeDefinitions)
   {
     // Attributes
     var template = reader.GetOptionalAttribute("template");
-    Object? obj = null;
+    Model.Layers.Objects.Object? obj = null;
     if (template is not null)
       obj = externalTemplateResolver(template).Object;
 
@@ -106,7 +112,7 @@ internal partial class Tmx
     var visible = reader.GetOptionalAttributeParseable<bool>("visible") ?? visibleDefault;
 
     // Elements
-    Object? foundObject = null;
+    Model.Layers.Objects.Object? foundObject = null;
     int propertiesCounter = 0;
     Dictionary<string, IProperty>? properties = propertiesDefault;
 
@@ -144,7 +150,7 @@ internal partial class Tmx
     return OverrideObject(obj, foundObject);
   }
 
-  internal static Object OverrideObject(Object? obj, Object foundObject)
+  internal static Model.Layers.Objects.Object OverrideObject(Model.Layers.Objects.Object? obj, Model.Layers.Objects.Object foundObject)
   {
     if (obj is null)
       return foundObject;
@@ -315,7 +321,7 @@ internal partial class Tmx
     Tileset? tileset = null;
 
     // Should contain exactly one of
-    Object? obj = null;
+    Model.Layers.Objects.Object? obj = null;
 
     reader.ProcessChildren("template", (r, elementName) => elementName switch
     {

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

@@ -1,8 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 internal partial class Tmx
 {

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

@@ -2,8 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 internal partial class Tmx
 {

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

@@ -3,8 +3,13 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Layers;
+using DotTiled.Model.Properties;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 internal partial class Tmx
 {

src/DotTiled/Serialization/Tmx/TmxMapReader.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 public class TmxMapReader : IMapReader
 {

src/DotTiled/Serialization/Tmx/TsxTilesetReader.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 public class TsxTilesetReader : ITilesetReader
 {

src/DotTiled/Serialization/Tmx/TxTemplateReader.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Xml;
+using DotTiled.Model;
+using DotTiled.Model.Properties.CustomTypes;
+using DotTiled.Model.Tilesets;
 
-namespace DotTiled;
+namespace DotTiled.Serialization.Tmx;
 
 public class TxTemplateReader : ITemplateReader
 {