diff --git a/LadybugTools_Engine/LadybugTools_Engine.csproj b/LadybugTools_Engine/LadybugTools_Engine.csproj
index 7aac0bd3..88dab083 100644
--- a/LadybugTools_Engine/LadybugTools_Engine.csproj
+++ b/LadybugTools_Engine/LadybugTools_Engine.csproj
@@ -189,7 +189,6 @@
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\simulate\working_directory.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\simulate\__init__.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\cfd\cfd_directory.py" />
-    <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\cfd\cfd_result.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\cfd\load_cfd_extract.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\cfd\load_cfd_results.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\cfd\spatial_wind_speed.py" />
@@ -221,7 +220,6 @@
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\moisture_distribution\load_moisture_sources.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\moisture_distribution\moisture_directory.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\moisture_distribution\moisture_source.py" />
-    <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\moisture_distribution\unique_wind_speed_direction.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\moisture_distribution\__init__.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\sky_view_pov.py" />
     <Content Include="Python\src\ladybugtools_toolkit\external_comfort\spatial\spatial_comfort.py" />
@@ -297,6 +295,7 @@
     <Content Include="Python\src\ladybugtools_toolkit\ladybug_extension\epw\sun_position_list.py" />
     <Content Include="Python\src\ladybugtools_toolkit\ladybug_extension\epw\to_dataframe.py" />
     <Content Include="Python\src\ladybugtools_toolkit\ladybug_extension\epw\wet_bulb_temperature.py" />
+    <Content Include="Python\src\ladybugtools_toolkit\ladybug_extension\epw\unique_wind_speed_direction.py" />
     <Content Include="Python\src\ladybugtools_toolkit\ladybug_extension\epw\__init__.py" />
     <Content Include="Python\src\ladybugtools_toolkit\ladybug_extension\header\from_string.py" />
     <Content Include="Python\src\ladybugtools_toolkit\ladybug_extension\header\from_multiindex.py" />
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/cfd/cfd_result.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/cfd/cfd_result.py
deleted file mode 100644
index bf76e47b..00000000
--- a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/cfd/cfd_result.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-from typing import List
-
-import numpy as np
-import pandas as pd
-from ladybug.epw import EPW
-from ladybugtools_toolkit.external_comfort.spatial.cfd.cfd_directory import (
-    cfd_directory,
-)
-
-
-class CFDResult:
-    """An object containing results from a CFD simulation.
-    # These results should be extracted from a number of CFD simulations at the same point locations
-    # as in the SpatialComfort simulation, for upwards of 8 (cardinal) directions. Results should be saved in the
-    """
-
-    def __init__(self) -> CFDResult:
-        self.i = None
-
-    @classmethod
-    def from_directory(cls, cfd_directory: Path) -> CFDResult:
-        return None
-
-    @staticmethod
-    def _unique_wind_speed_direction(epw: EPW) -> List[List[float]]:
-        """Create a list of unique Wind Speed and Wind Direction values for a given EPW"""
-        wind_speed_directions = np.stack(
-            [epw.wind_speed.values, epw.wind_direction.values], axis=1
-        )
-        return np.unique(wind_speed_directions, axis=0)
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/cfd/spatial_wind_speed.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/cfd/spatial_wind_speed.py
index 045ce819..bb7f31c9 100644
--- a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/cfd/spatial_wind_speed.py
+++ b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/cfd/spatial_wind_speed.py
@@ -3,17 +3,14 @@
 import numpy as np
 import pandas as pd
 from ladybug.epw import EPW
-from ladybugtools_toolkit.external_comfort.spatial.cfd.load_cfd_results import (
-    load_cfd_results,
-)
-from ladybugtools_toolkit.external_comfort.spatial.moisture_distribution.unique_wind_speed_direction import (
-    unique_wind_speed_direction,
-)
-from ladybugtools_toolkit.ladybug_extension.datacollection.to_series import to_series
-from scipy.interpolate import interp1d
-
-
 from ladybugtools_toolkit import analytics
+from ladybugtools_toolkit.external_comfort.spatial.cfd.load_cfd_results import \
+    load_cfd_results
+from ladybugtools_toolkit.ladybug_extension.datacollection.to_series import \
+    to_series
+from ladybugtools_toolkit.ladybug_extension.epw.unique_wind_speed_direction import \
+    unique_wind_speed_direction
+from scipy.interpolate import interp1d
 
 
 @analytics
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/moisture_distribution/moisture_source.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/moisture_distribution/moisture_source.py
index 85fbdd51..905e49c9 100644
--- a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/moisture_distribution/moisture_source.py
+++ b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/moisture_distribution/moisture_source.py
@@ -7,12 +7,12 @@
 import numpy as np
 import pandas as pd
 from ladybug.epw import EPW
-from ladybugtools_toolkit.external_comfort.spatial.moisture_distribution.unique_wind_speed_direction import (
-    unique_wind_speed_direction,
-)
 from ladybugtools_toolkit.helpers.angle_from_north import angle_from_north
 from ladybugtools_toolkit.helpers.proximity_decay import proximity_decay
-from ladybugtools_toolkit.ladybug_extension.datacollection.to_series import to_series
+from ladybugtools_toolkit.ladybug_extension.datacollection.to_series import \
+    to_series
+from ladybugtools_toolkit.ladybug_extension.epw.unique_wind_speed_direction import \
+    unique_wind_speed_direction
 from scipy.spatial.distance import cdist
 
 
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/moisture_distribution/unique_wind_speed_direction.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/ladybug_extension/epw/unique_wind_speed_direction.py
similarity index 96%
rename from LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/moisture_distribution/unique_wind_speed_direction.py
rename to LadybugTools_Engine/Python/src/ladybugtools_toolkit/ladybug_extension/epw/unique_wind_speed_direction.py
index 427723d6..2c37e6f5 100644
--- a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/external_comfort/spatial/moisture_distribution/unique_wind_speed_direction.py
+++ b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/ladybug_extension/epw/unique_wind_speed_direction.py
@@ -2,10 +2,9 @@
 
 import pandas as pd
 from ladybug.epw import EPW
-from ladybugtools_toolkit.ladybug_extension.datacollection.to_series import to_series
-
-
 from ladybugtools_toolkit import analytics
+from ladybugtools_toolkit.ladybug_extension.datacollection.to_series import \
+    to_series
 
 
 @analytics