diff --git a/Client/Application/ViewModels/CreatureListViewModel.cs b/Client/Application/ViewModels/CreatureListViewModel.cs
index 78d1a31..0872eb7 100644
--- a/Client/Application/ViewModels/CreatureListViewModel.cs
+++ b/Client/Application/ViewModels/CreatureListViewModel.cs
@@ -17,9 +17,9 @@ namespace Client.Application.ViewModels
 
         public string BriefInfo => creature.BriefInfo;
 
-        public float Distance => creature.Transform.Position.HorizontalDistance(hero.Transform.Position) / 100;
+        public float Distance => creature.Distance(hero);
 
-        public float DeltaZ => (creature.Transform.Position.Z - hero.Transform.Position.Z) / 100;
+        public float DeltaZ => creature.DeltaZ(hero);
 
         public CreatureListViewModel(CreatureInterface creature, Hero hero)
         {
diff --git a/Client/Application/ViewModels/MainViewModel.cs b/Client/Application/ViewModels/MainViewModel.cs
index 996271a..3721277 100644
--- a/Client/Application/ViewModels/MainViewModel.cs
+++ b/Client/Application/ViewModels/MainViewModel.cs
@@ -1,5 +1,4 @@
-using Client.Application.Extensions;
-using Client.Domain.Common;
+using Client.Domain.Common;
 using Client.Domain.Entities;
 using Client.Domain.Events;
 using Client.Domain.ValueObjects;
diff --git a/Client/Client.csproj b/Client/Client.csproj
index 8b3c85d..71a183b 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -29,4 +29,8 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Application\Extensions\" />
+	</ItemGroup>
+
 </Project>
diff --git a/Client/Domain/Common/CreatureExtensions.cs b/Client/Domain/Common/CreatureExtensions.cs
new file mode 100644
index 0000000..0720448
--- /dev/null
+++ b/Client/Domain/Common/CreatureExtensions.cs
@@ -0,0 +1,23 @@
+using Client.Domain.Entities;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Client.Domain.Common
+{
+    public static class CreatureExtensions
+    {
+        public static float Distance(this CreatureInterface creature, CreatureInterface other)
+        {
+            return creature.Transform.Position.HorizontalDistance(other.Transform.Position) / 100;
+        }
+
+        public static float DeltaZ(this CreatureInterface creature, CreatureInterface other)
+        {
+            return (creature.Transform.Position.Z - other.Transform.Position.Z) / 100;
+        }
+    }
+}
diff --git a/Client/Application/Extensions/ObservableCollectionExtensions.cs b/Client/Domain/Common/ObservableCollectionExtensions.cs
similarity index 94%
rename from Client/Application/Extensions/ObservableCollectionExtensions.cs
rename to Client/Domain/Common/ObservableCollectionExtensions.cs
index 528ede9..ed737b7 100644
--- a/Client/Application/Extensions/ObservableCollectionExtensions.cs
+++ b/Client/Domain/Common/ObservableCollectionExtensions.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Client.Application.Extensions
+namespace Client.Domain.Common
 {
     public static class ObservableCollectionExtensions
     {