diff --git a/hopp/simulation/hybrid_simulation.py b/hopp/simulation/hybrid_simulation.py
index 33b56f083..6a8daed4a 100644
--- a/hopp/simulation/hybrid_simulation.py
+++ b/hopp/simulation/hybrid_simulation.py
@@ -17,7 +17,6 @@
 from hopp.simulation.technologies.pv_source import PVPlant
 from hopp.simulation.technologies.detailed_pv_plant import DetailedPVPlant
 from hopp.simulation.technologies.wind_source import WindPlant
-from hopp.simulation.technologies.wind_source_refactor import WindPlantRefactor
 from hopp.simulation.technologies.tower_source import TowerPlant
 from hopp.simulation.technologies.trough_source import TroughPlant
 from hopp.simulation.technologies.battery import Battery
diff --git a/hopp/simulation/technologies/__init__.py b/hopp/simulation/technologies/__init__.py
index 71f83e895..4932b416f 100644
--- a/hopp/simulation/technologies/__init__.py
+++ b/hopp/simulation/technologies/__init__.py
@@ -10,4 +10,3 @@
 from hopp.simulation.technologies.trough_source import TroughPlant
 from hopp.simulation.technologies.utility_rate import UtilityRate
 from hopp.simulation.technologies.wind_source import WindPlant
-from hopp.simulation.technologies.wind_source_refactor import WindPlantRefactor
diff --git a/hopp/simulation/technologies/layout/flicker_mismatch_grid.py b/hopp/simulation/technologies/layout/flicker_mismatch_grid.py
index 70175ef39..263f449e9 100644
--- a/hopp/simulation/technologies/layout/flicker_mismatch_grid.py
+++ b/hopp/simulation/technologies/layout/flicker_mismatch_grid.py
@@ -1,7 +1,7 @@
 import sys
 from pathlib import Path
 from itertools import product
-import multiprocessing_on_dill as mp
+import multiprocessing as mp
 from typing import Union
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/hopp/simulation/technologies/wind/floris.py b/hopp/simulation/technologies/wind/floris.py
index c673d6004..8acd20b93 100644
--- a/hopp/simulation/technologies/wind/floris.py
+++ b/hopp/simulation/technologies/wind/floris.py
@@ -6,14 +6,14 @@
 from floris.tools import FlorisInterface
 
 from hopp.simulation.base import BaseClass
-from hopp.simulation.technologies.sites import SiteInfoRefactor
+from hopp.simulation.technologies.sites import SiteInfo
 from hopp.type_dec import resource_file_converter
 
 
 @define
 class Floris(BaseClass):
     config_dict: dict = field(converter=dict)
-    site: SiteInfoRefactor = field()
+    site: SiteInfo = field()
     timestep: tuple = field(default=(), converter=tuple)
 
     def __attrs_post_init__(self):
diff --git a/hopp/type_dec.py b/hopp/type_dec.py
new file mode 100644
index 000000000..c71a0d689
--- /dev/null
+++ b/hopp/type_dec.py
@@ -0,0 +1,172 @@
+# Copyright 2022 NREL
+
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+from typing import Any, Iterable, Tuple, Union, Callable
+
+import attrs
+from attrs import define, Attribute
+from pathlib import Path
+import numpy as np
+import numpy.typing as npt
+import os.path
+
+from hopp.utilities.log import hybrid_logger as logger
+
+
+### Define general data types used throughout
+
+hopp_path = Path(__file__).parent.parent
+hopp_float_type = np.float64
+
+NDArrayFloat = npt.NDArray[hopp_float_type]
+NDArrayInt = npt.NDArray[np.int_]
+NDArrayFilter = Union[npt.NDArray[np.int_], npt.NDArray[np.bool_]]
+NDArrayObject = npt.NDArray[np.object_]
+
+
+### Custom callables for attrs objects and functions
+
+def hopp_array_converter(data: Iterable) -> np.ndarray:
+    try:
+        a = np.array(data, dtype=hopp_float_type)
+    except TypeError as e:
+        raise TypeError(e.args[0] + f". Data given: {data}")
+    return a
+
+def resource_file_converter(resource_file: str) -> None:
+    # If the default value of an empty string is supplied, just pass through the default
+    if resource_file == "":
+        return resource_file
+
+    # Check the path relative to the hopp directory for the resource file and return if it exists
+    resource_file_path = str(hopp_path / resource_file)
+    resolved_path = convert_to_path(resource_file_path)
+    file_exists = os.path.isfile(resolved_path)
+    if file_exists:
+        return resolved_path
+    else: # If path doesn't exist, check for absolute path
+        resolved_path = convert_to_path(resource_file_path)
+        file_exists = os.path.isfile(resolved_path)
+        if file_exists:
+            return resolved_path
+        else:
+            raise FileNotFoundError (
+                f"Resource file path is not resolvable: {resource_file}. "
+                "The resource file path needs to be relative to the root HOPP directory "
+                "or be absolute."
+            )
+
+def attr_serializer(inst: type, field: Attribute, value: Any):
+    if isinstance(value, np.ndarray):
+        return value.tolist()
+    return value
+
+def attr_hopp_filter(inst: Attribute, value: Any) -> bool:
+    if inst.init is False:
+        return False
+    if value is None:
+        return False
+    if isinstance(value, np.ndarray):
+        if value.size == 0:
+            return False
+    return True
+
+def iter_validator(iter_type, item_types: Union[Any, Tuple[Any]]) -> Callable:
+    """Helper function to generate iterable validators that will reduce the amount of
+    boilerplate code.
+
+    Parameters
+    ----------
+    iter_type : any iterable
+        The type of iterable object that should be validated.
+    item_types : Union[Any, Tuple[Any]]
+        The type or types of acceptable item types.
+
+    Returns
+    -------
+    Callable
+        The attr.validators.deep_iterable iterable and instance validator.
+    """
+    validator = attrs.validators.deep_iterable(
+        member_validator=attrs.validators.instance_of(item_types),
+        iterable_validator=attrs.validators.instance_of(iter_type),
+    )
+    return validator
+
+def convert_to_path(fn: str | Path) -> Path:
+    """Converts an input string or pathlib.Path object to a fully resolved ``pathlib.Path``
+    object.
+
+    Args:
+        fn (str | Path): The user input file path or file name.
+
+    Raises:
+        TypeError: Raised if :py:attr:`fn` is neither a :py:obj:`str`, nor a :py:obj:`pathlib.Path`.
+
+    Returns:
+        Path: A resolved pathlib.Path object.
+    """
+    if isinstance(fn, str):
+        fn = Path(fn)
+
+    if isinstance(fn, Path):
+        fn.resolve()
+    else:
+        raise TypeError(f"The passed input: {fn} could not be converted to a pathlib.Path object")
+    return fn
+
+@define
+class FromDictMixin:
+    """
+    A Mixin class to allow for kwargs overloading when a data class doesn't
+    have a specific parameter definied. This allows passing of larger dictionaries
+    to a data class without throwing an error.
+    """
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        """Maps a data dictionary to an `attr`-defined class.
+
+        TODO: Add an error to ensure that either none or all the parameters are passed in
+
+        Args:
+            data : dict
+                The data dictionary to be mapped.
+        Returns:
+            cls
+                The `attr`-defined class.
+        """
+        # Check for any inputs that aren't part of the class definition
+        class_attr_names = [a.name for a in cls.__attrs_attrs__]
+        extra_args = [d for d in data if d not in class_attr_names]
+        if len(extra_args):
+            raise AttributeError(f"The initialization for {cls.__name__} was given extraneous inputs: {extra_args}")
+
+        kwargs = {a.name: data[a.name] for a in cls.__attrs_attrs__ if a.name in data and a.init}
+
+        # Map the inputs must be provided: 1) must be initialized, 2) no default value defined
+        required_inputs = [a.name for a in cls.__attrs_attrs__ if a.init and a.default is attrs.NOTHING]
+        undefined = sorted(set(required_inputs) - set(kwargs))
+
+        if undefined:
+            raise AttributeError(f"The class defintion for {cls.__name__} is missing the following inputs: {undefined}")
+        return cls(**kwargs)
+
+    def as_dict(self) -> dict:
+        """Creates a JSON and YAML friendly dictionary that can be save for future reloading.
+        This dictionary will contain only `Python` types that can later be converted to their
+        proper `Turbine` formats.
+
+        Returns:
+            dict: All key, vaue pais required for class recreation.
+        """
+        return attrs.asdict(self, filter=attr_hopp_filter, value_serializer=attr_serializer)
diff --git a/tests/hopp/test_clustering.py b/tests/hopp/test_clustering.py
index 34c700004..753d338d2 100644
--- a/tests/hopp/test_clustering.py
+++ b/tests/hopp/test_clustering.py
@@ -1,4 +1,3 @@
-import pytest
 from pytest import approx
 import hopp.simulation.technologies.clustering as clustering
 import numpy as np