diff --git a/CREDITS b/CREDITS
index 79e90a71..6239bf7b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This is the official list of entities and people who have contributed to gprMax.
 #
diff --git a/docs/source/conf.py b/docs/source/conf.py
index f6d69e6f..ec3f0024 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -62,8 +62,8 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'gprMax'
-copyright = '2015-2019, The University of Edinburgh. Authors: Craig Warren and Antonis Giannopoulos'
-author = 'Craig Warren and Antonis Giannopoulos'
+copyright = '2015-2019, The University of Edinburgh. Authors: Craig Warren, Antonis Giannopoulos, and John Hartley'
+author = 'Craig Warren, Antonis Giannopoulos, and John Hartley'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -241,7 +241,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'gprMax.tex', 'gprMax User Guide',
-     'Craig Warren and Antonis Giannopoulos', 'manual'),
+     'Craig Warren, Antonis Giannopoulos, and John Hartley', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/gprMax/cmds_geometry/add_grass.py b/gprMax/cmds_geometry/add_grass.py
index 290cafbf..0afac32f 100644
--- a/gprMax/cmds_geometry/add_grass.py
+++ b/gprMax/cmds_geometry/add_grass.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -18,12 +18,11 @@
 
 import logging
 
-import gprMax.config as config
 import numpy as np
 
 from ..fractals import FractalSurface, Grass
 from ..materials import create_grass
-from ..utilities import round_value
+from ..utilities.utilities import round_value
 from .cmds_geometry import UserObjectGeometry, rotate_2point_object
 
 logger = logging.getLogger(__name__)
diff --git a/gprMax/cmds_geometry/add_surface_roughness.py b/gprMax/cmds_geometry/add_surface_roughness.py
index 9a7ef1ac..954f634f 100644
--- a/gprMax/cmds_geometry/add_surface_roughness.py
+++ b/gprMax/cmds_geometry/add_surface_roughness.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -21,7 +21,7 @@ import logging
 import numpy as np
 
 from ..fractals import FractalSurface
-from ..utilities import round_value
+from ..utilities.utilities import round_value
 from .cmds_geometry import UserObjectGeometry, rotate_2point_object
 
 logger = logging.getLogger(__name__)
diff --git a/gprMax/cmds_geometry/add_surface_water.py b/gprMax/cmds_geometry/add_surface_water.py
index 50fbfcc9..54958809 100644
--- a/gprMax/cmds_geometry/add_surface_water.py
+++ b/gprMax/cmds_geometry/add_surface_water.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -18,11 +18,10 @@
 
 import logging
 
-import gprMax.config as config
 import numpy as np
 
 from ..materials import create_water
-from ..utilities import round_value
+from ..utilities.utilities import round_value
 from .cmds_geometry import UserObjectGeometry, rotate_2point_object
 
 logger = logging.getLogger(__name__)
diff --git a/gprMax/cmds_geometry/box.py b/gprMax/cmds_geometry/box.py
index 196b32f2..4ed751f9 100644
--- a/gprMax/cmds_geometry/box.py
+++ b/gprMax/cmds_geometry/box.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/build_templates.py b/gprMax/cmds_geometry/build_templates.py
index 85737ec4..6300d724 100644
--- a/gprMax/cmds_geometry/build_templates.py
+++ b/gprMax/cmds_geometry/build_templates.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
-from jinja2 import Environment, PackageLoader, select_autoescape
+from jinja2 import Environment, PackageLoader
 
 env = Environment(
     loader=PackageLoader(__name__, 'templates'),
diff --git a/gprMax/cmds_geometry/cmds_geometry.py b/gprMax/cmds_geometry/cmds_geometry.py
index cd812ed1..71725e8f 100644
--- a/gprMax/cmds_geometry/cmds_geometry.py
+++ b/gprMax/cmds_geometry/cmds_geometry.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/cylinder.py b/gprMax/cmds_geometry/cylinder.py
index 75a0c9ad..43db0318 100644
--- a/gprMax/cmds_geometry/cylinder.py
+++ b/gprMax/cmds_geometry/cylinder.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/cylindrical_sector.py b/gprMax/cmds_geometry/cylindrical_sector.py
index 7d6c7f87..35cdd237 100644
--- a/gprMax/cmds_geometry/cylindrical_sector.py
+++ b/gprMax/cmds_geometry/cylindrical_sector.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/edge.py b/gprMax/cmds_geometry/edge.py
index 729f6a02..ee065820 100644
--- a/gprMax/cmds_geometry/edge.py
+++ b/gprMax/cmds_geometry/edge.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/fractal_box.py b/gprMax/cmds_geometry/fractal_box.py
index 652ebc12..61e683f6 100644
--- a/gprMax/cmds_geometry/fractal_box.py
+++ b/gprMax/cmds_geometry/fractal_box.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/fractal_box_builder.py b/gprMax/cmds_geometry/fractal_box_builder.py
index 3d8e8f25..1a4e6170 100644
--- a/gprMax/cmds_geometry/fractal_box_builder.py
+++ b/gprMax/cmds_geometry/fractal_box_builder.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/geometry_objects_read.py b/gprMax/cmds_geometry/geometry_objects_read.py
index d6846164..728b5bbd 100644
--- a/gprMax/cmds_geometry/geometry_objects_read.py
+++ b/gprMax/cmds_geometry/geometry_objects_read.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -24,7 +24,7 @@ import h5py
 
 from ..cython.geometry_primitives import build_voxels_from_array
 from ..hash_cmds_file import get_user_objects
-from ..utilities import round_value
+from ..utilities.utilities import round_value
 from .cmds_geometry import UserObjectGeometry
 
 logger = logging.getLogger(__name__)
diff --git a/gprMax/cmds_geometry/plate.py b/gprMax/cmds_geometry/plate.py
index 82ea1cdd..d9de0763 100644
--- a/gprMax/cmds_geometry/plate.py
+++ b/gprMax/cmds_geometry/plate.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/sphere.py b/gprMax/cmds_geometry/sphere.py
index 710fb519..0ca250bc 100644
--- a/gprMax/cmds_geometry/sphere.py
+++ b/gprMax/cmds_geometry/sphere.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_geometry/triangle.py b/gprMax/cmds_geometry/triangle.py
index 4160d068..391bca98 100644
--- a/gprMax/cmds_geometry/triangle.py
+++ b/gprMax/cmds_geometry/triangle.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cmds_multiuse.py b/gprMax/cmds_multiuse.py
index 4ec7b168..106d5161 100644
--- a/gprMax/cmds_multiuse.py
+++ b/gprMax/cmds_multiuse.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -37,7 +37,7 @@ from .sources import MagneticDipole as MagneticDipoleUser
 from .sources import TransmissionLine as TransmissionLineUser
 from .sources import VoltageSource as VoltageSourceUser
 from .subgrids.base import SubGridBase
-from .utilities import round_value
+from .utilities.utilities import round_value
 from .waveforms import Waveform as WaveformUser
 
 logger = logging.getLogger(__name__)
diff --git a/gprMax/cmds_singleuse.py b/gprMax/cmds_singleuse.py
index 752bccc1..43ca0948 100644
--- a/gprMax/cmds_singleuse.py
+++ b/gprMax/cmds_singleuse.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -24,7 +24,7 @@ import gprMax.config as config
 import numpy as np
 from scipy import interpolate
 
-from .utilities import set_omp_threads
+from .utilities.host_info import set_omp_threads
 from .waveforms import Waveform
 
 logger = logging.getLogger(__name__)
diff --git a/gprMax/config.pxd b/gprMax/config.pxd
index b9cf9e4c..18489fc5 100644
--- a/gprMax/config.pxd
+++ b/gprMax/config.pxd
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/config.py b/gprMax/config.py
index 67a0802d..12505f61 100644
--- a/gprMax/config.py
+++ b/gprMax/config.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -28,7 +28,8 @@ from scipy.constants import c
 from scipy.constants import epsilon_0 as e0
 from scipy.constants import mu_0 as m0
 
-from .utilities import detect_gpus, get_host_info, get_terminal_width
+from .utilities.host_info import detect_gpus, get_host_info
+from .utilities.utilities import get_terminal_width
 
 logger = logging.getLogger(__name__)
 
diff --git a/gprMax/contexts.py b/gprMax/contexts.py
index 4e5086f0..a0c3e2c0 100644
--- a/gprMax/contexts.py
+++ b/gprMax/contexts.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -25,7 +25,7 @@ import gprMax.config as config
 from ._version import __version__, codename
 from .model_build_run import ModelBuildRun
 from .solvers import create_G, create_solver
-from .utilities import get_terminal_width, human_size, logo, timer
+from .utilities.utilities import get_terminal_width, human_size, logo, timer
 
 logger = logging.getLogger(__name__)
 
diff --git a/gprMax/cuda/fields_updates.py b/gprMax/cuda/fields_updates.py
index a972b293..5eb50559 100644
--- a/gprMax/cuda/fields_updates.py
+++ b/gprMax/cuda/fields_updates.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cuda/pml_updates_electric_HORIPML.py b/gprMax/cuda/pml_updates_electric_HORIPML.py
index b3005357..8d5966ec 100644
--- a/gprMax/cuda/pml_updates_electric_HORIPML.py
+++ b/gprMax/cuda/pml_updates_electric_HORIPML.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cuda/pml_updates_electric_MRIPML.py b/gprMax/cuda/pml_updates_electric_MRIPML.py
index e3a4c34b..b223411a 100644
--- a/gprMax/cuda/pml_updates_electric_MRIPML.py
+++ b/gprMax/cuda/pml_updates_electric_MRIPML.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cuda/pml_updates_magnetic_HORIPML.py b/gprMax/cuda/pml_updates_magnetic_HORIPML.py
index d7e862e8..44373585 100644
--- a/gprMax/cuda/pml_updates_magnetic_HORIPML.py
+++ b/gprMax/cuda/pml_updates_magnetic_HORIPML.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cuda/pml_updates_magnetic_MRIPML.py b/gprMax/cuda/pml_updates_magnetic_MRIPML.py
index 2db1630c..b9909b60 100644
--- a/gprMax/cuda/pml_updates_magnetic_MRIPML.py
+++ b/gprMax/cuda/pml_updates_magnetic_MRIPML.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cuda/snapshots.py b/gprMax/cuda/snapshots.py
index 9fb3f33b..5f461c40 100644
--- a/gprMax/cuda/snapshots.py
+++ b/gprMax/cuda/snapshots.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cuda/source_updates.py b/gprMax/cuda/source_updates.py
index 3b87f5ae..9a5276b7 100644
--- a/gprMax/cuda/source_updates.py
+++ b/gprMax/cuda/source_updates.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/fields_updates_hsg.pyx b/gprMax/cython/fields_updates_hsg.pyx
index 85218cd1..7a81dc58 100644
--- a/gprMax/cython/fields_updates_hsg.pyx
+++ b/gprMax/cython/fields_updates_hsg.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/fields_updates_normal.pyx b/gprMax/cython/fields_updates_normal.pyx
index e77d15f8..4c02a834 100644
--- a/gprMax/cython/fields_updates_normal.pyx
+++ b/gprMax/cython/fields_updates_normal.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/fractals_generate.pyx b/gprMax/cython/fractals_generate.pyx
index 8652c3fa..60172fbb 100644
--- a/gprMax/cython/fractals_generate.pyx
+++ b/gprMax/cython/fractals_generate.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/geometry_outputs.pyx b/gprMax/cython/geometry_outputs.pyx
index f749f995..ff40eecc 100644
--- a/gprMax/cython/geometry_outputs.pyx
+++ b/gprMax/cython/geometry_outputs.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/geometry_primitives.pyx b/gprMax/cython/geometry_primitives.pyx
index 633c1a8a..85bc9cb1 100644
--- a/gprMax/cython/geometry_primitives.pyx
+++ b/gprMax/cython/geometry_primitives.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -30,7 +30,7 @@ from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_E
 from gprMax.cython.yee_cell_setget_rigid cimport unset_rigid_E
 from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_H
 from gprMax.cython.yee_cell_setget_rigid cimport unset_rigid_H
-from gprMax.utilities import round_value
+from gprMax.utilities.utilities import round_value
 
 
 cpdef bint are_clockwise(
diff --git a/gprMax/cython/pml_updates_electric_HORIPML.pyx b/gprMax/cython/pml_updates_electric_HORIPML.pyx
index 3404ebf1..572d3d94 100644
--- a/gprMax/cython/pml_updates_electric_HORIPML.pyx
+++ b/gprMax/cython/pml_updates_electric_HORIPML.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/pml_updates_electric_MRIPML.pyx b/gprMax/cython/pml_updates_electric_MRIPML.pyx
index e39ee3c7..d23d78ce 100644
--- a/gprMax/cython/pml_updates_electric_MRIPML.pyx
+++ b/gprMax/cython/pml_updates_electric_MRIPML.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/pml_updates_magnetic_HORIPML.pyx b/gprMax/cython/pml_updates_magnetic_HORIPML.pyx
index 9af27da4..778e5715 100644
--- a/gprMax/cython/pml_updates_magnetic_HORIPML.pyx
+++ b/gprMax/cython/pml_updates_magnetic_HORIPML.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/pml_updates_magnetic_MRIPML.pyx b/gprMax/cython/pml_updates_magnetic_MRIPML.pyx
index cb0e23a8..16c72cac 100644
--- a/gprMax/cython/pml_updates_magnetic_MRIPML.pyx
+++ b/gprMax/cython/pml_updates_magnetic_MRIPML.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/snapshots.pyx b/gprMax/cython/snapshots.pyx
index 7d16cca7..710abef3 100644
--- a/gprMax/cython/snapshots.pyx
+++ b/gprMax/cython/snapshots.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/yee_cell_build.pyx b/gprMax/cython/yee_cell_build.pyx
index 52c0f60d..686422f4 100644
--- a/gprMax/cython/yee_cell_build.pyx
+++ b/gprMax/cython/yee_cell_build.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/yee_cell_setget_rigid.pxd b/gprMax/cython/yee_cell_setget_rigid.pxd
index b90f8590..62982f30 100644
--- a/gprMax/cython/yee_cell_setget_rigid.pxd
+++ b/gprMax/cython/yee_cell_setget_rigid.pxd
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/cython/yee_cell_setget_rigid.pyx b/gprMax/cython/yee_cell_setget_rigid.pyx
index fb4c70b2..9da15f9e 100644
--- a/gprMax/cython/yee_cell_setget_rigid.pyx
+++ b/gprMax/cython/yee_cell_setget_rigid.pyx
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/fields_outputs.py b/gprMax/fields_outputs.py
index 32f8f62f..7fc72d10 100644
--- a/gprMax/fields_outputs.py
+++ b/gprMax/fields_outputs.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -17,7 +17,6 @@
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from pathlib import Path
 from string import Template
 
 import h5py
diff --git a/gprMax/fractals.py b/gprMax/fractals.py
index dfea26cd..657109e2 100644
--- a/gprMax/fractals.py
+++ b/gprMax/fractals.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -21,7 +21,7 @@ import numpy as np
 from scipy import fftpack
 
 from .cython.fractals_generate import generate_fractal2D, generate_fractal3D
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 np.seterr(divide='raise')
 
diff --git a/gprMax/geometry_outputs.py b/gprMax/geometry_outputs.py
index 7545a317..737d4d88 100644
--- a/gprMax/geometry_outputs.py
+++ b/gprMax/geometry_outputs.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -21,7 +21,6 @@ try:
 except ImportError:
     import xml.etree.ElementTree as ET
 import logging
-import os
 from pathlib import Path
 from struct import pack
 
@@ -32,7 +31,7 @@ import numpy as np
 from ._version import __version__
 from .cython.geometry_outputs import (define_fine_geometry,
                                       define_normal_geometry)
-from .utilities import pretty_xml, round_value
+from .utilities.utilities import pretty_xml, round_value
 
 logger = logging.getLogger(__name__)
 
diff --git a/gprMax/gprMax.py b/gprMax/gprMax.py
index d8f33db7..98cc43f3 100644
--- a/gprMax/gprMax.py
+++ b/gprMax/gprMax.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -21,7 +21,7 @@ import argparse
 import gprMax.config as config
 
 from .contexts import Context, MPIContext, SPOTPYContext
-from .utilities import logging_config
+from .utilities.logging import logging_config
 
 # Arguments (used for API) and their default values (used for API and CLI)
 args_defaults = {'scenes': None,
diff --git a/gprMax/grid.py b/gprMax/grid.py
index ea20bba0..32d53ee4 100644
--- a/gprMax/grid.py
+++ b/gprMax/grid.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,7 +22,7 @@ from collections import OrderedDict
 import gprMax.config as config
 import numpy as np
 from .pml import CFS, PML
-from .utilities import fft_power, human_size, round_value
+from .utilities.utilities import fft_power, human_size, round_value
 
 np.seterr(invalid='raise')
 
diff --git a/gprMax/hash_cmds_file.py b/gprMax/hash_cmds_file.py
index 30e17b7d..4150325e 100644
--- a/gprMax/hash_cmds_file.py
+++ b/gprMax/hash_cmds_file.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -17,7 +17,6 @@
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import os
 import sys
 from io import StringIO
 from pathlib import Path
diff --git a/gprMax/hash_cmds_geometry.py b/gprMax/hash_cmds_geometry.py
index 075bf9ef..c7f70a20 100644
--- a/gprMax/hash_cmds_geometry.py
+++ b/gprMax/hash_cmds_geometry.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -30,7 +30,7 @@ from .cmds_geometry.fractal_box import FractalBox
 from .cmds_geometry.plate import Plate
 from .cmds_geometry.sphere import Sphere
 from .cmds_geometry.triangle import Triangle
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 logger = logging.getLogger(__name__)
 
diff --git a/gprMax/hash_cmds_multiuse.py b/gprMax/hash_cmds_multiuse.py
index 5500ea96..1345eda6 100644
--- a/gprMax/hash_cmds_multiuse.py
+++ b/gprMax/hash_cmds_multiuse.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/hash_cmds_singleuse.py b/gprMax/hash_cmds_singleuse.py
index 90d6f97f..064cb9bf 100644
--- a/gprMax/hash_cmds_singleuse.py
+++ b/gprMax/hash_cmds_singleuse.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/materials.py b/gprMax/materials.py
index 1a8bebfc..835eacce 100644
--- a/gprMax/materials.py
+++ b/gprMax/materials.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/model_build_run.py b/gprMax/model_build_run.py
index a3326ab0..54f7bcf7 100644
--- a/gprMax/model_build_run.py
+++ b/gprMax/model_build_run.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,11 +22,13 @@ import logging
 import sys
 from pathlib import Path
 
-import gprMax.config as config
 import numpy as np
 import psutil
 from colorama import Fore, Style, init
 init()
+
+import gprMax.config as config
+
 from terminaltables import SingleTable
 from tqdm import tqdm
 
@@ -38,8 +40,8 @@ from .hash_cmds_file import parse_hash_commands
 from .materials import process_materials
 from .pml import build_pml, print_pml_info
 from .scene import Scene
-from .utilities import (get_terminal_width, human_size, mem_check_all,
-                        set_omp_threads)
+from .utilities.host_info import mem_check_all, set_omp_threads
+from .utilities.utilities import get_terminal_width, human_size
 
 logger = logging.getLogger(__name__)
 
diff --git a/gprMax/pml.py b/gprMax/pml.py
index 7447a85f..d5ce0647 100644
--- a/gprMax/pml.py
+++ b/gprMax/pml.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/receivers.py b/gprMax/receivers.py
index 96877ffe..27899c90 100644
--- a/gprMax/receivers.py
+++ b/gprMax/receivers.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/scene.py b/gprMax/scene.py
index 46a40da8..c752e29f 100644
--- a/gprMax/scene.py
+++ b/gprMax/scene.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -26,7 +26,6 @@ from .cmds_singleuse import (Discretisation, Domain, TimeWindow,
 from .materials import create_built_in_materials
 from .subgrids.user_objects import SubGridBase as SubGridUserBase
 from .user_inputs import create_user_input_points
-from .utilities import human_size
 
 logger = logging.getLogger(__name__)
 
diff --git a/gprMax/snapshots.py b/gprMax/snapshots.py
index 23e49453..37306f6b 100644
--- a/gprMax/snapshots.py
+++ b/gprMax/snapshots.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
 from struct import pack
 
 import h5py
@@ -26,7 +25,7 @@ import gprMax.config as config
 
 from ._version import __version__
 from .cython.snapshots import calculate_snapshot_fields
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 
 class Snapshot:
diff --git a/gprMax/solvers.py b/gprMax/solvers.py
index ce3678e5..3af39424 100644
--- a/gprMax/solvers.py
+++ b/gprMax/solvers.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/sources.py b/gprMax/sources.py
index 09c985b1..d9714c0b 100644
--- a/gprMax/sources.py
+++ b/gprMax/sources.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,7 +22,7 @@ import gprMax.config as config
 import numpy as np
 
 from .grid import Ix, Iy, Iz
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 
 class Source:
diff --git a/gprMax/subgrids/base.py b/gprMax/subgrids/base.py
index ac3074a5..76580989 100644
--- a/gprMax/subgrids/base.py
+++ b/gprMax/subgrids/base.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/subgrids/multi.py b/gprMax/subgrids/multi.py
index 61c02459..a070c5f8 100644
--- a/gprMax/subgrids/multi.py
+++ b/gprMax/subgrids/multi.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/subgrids/precursor_nodes.py b/gprMax/subgrids/precursor_nodes.py
index de096dc6..2049c2c2 100644
--- a/gprMax/subgrids/precursor_nodes.py
+++ b/gprMax/subgrids/precursor_nodes.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/subgrids/subgrid_hsg.py b/gprMax/subgrids/subgrid_hsg.py
index 8184af29..a65b2030 100644
--- a/gprMax/subgrids/subgrid_hsg.py
+++ b/gprMax/subgrids/subgrid_hsg.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/subgrids/updates.py b/gprMax/subgrids/updates.py
index 7f8f83ce..af1ed105 100644
--- a/gprMax/subgrids/updates.py
+++ b/gprMax/subgrids/updates.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/subgrids/user_objects.py b/gprMax/subgrids/user_objects.py
index b485df84..74883e85 100644
--- a/gprMax/subgrids/user_objects.py
+++ b/gprMax/subgrids/user_objects.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -20,7 +20,6 @@ import logging
 from copy import copy
 
 import numpy as np
-from gprMax import config
 
 from ..cmds_geometry.cmds_geometry import UserObjectGeometry
 from ..cmds_multiuse import Rx, UserObjectMulti
diff --git a/gprMax/templates/fields_updates_dispersive_template b/gprMax/templates/fields_updates_dispersive_template
index aba31ee1..be9d2465 100644
--- a/gprMax/templates/fields_updates_dispersive_template
+++ b/gprMax/templates/fields_updates_dispersive_template
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/gprMax/updates.py b/gprMax/updates.py
index 5b251292..974f79cd 100644
--- a/gprMax/updates.py
+++ b/gprMax/updates.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -19,9 +19,10 @@
 import logging
 from importlib import import_module
 
-import gprMax.config as config
 import numpy as np
 
+import gprMax.config as config
+
 from .cuda.fields_updates import kernel_template_fields
 from .cuda.snapshots import kernel_template_store_snapshot
 from .cuda.source_updates import kernel_template_sources
@@ -34,7 +35,9 @@ from .fields_outputs import store_outputs as store_outputs_cpu
 from .receivers import dtoh_rx_array, htod_rx_arrays
 from .snapshots import Snapshot, dtoh_snapshot_array, htod_snapshot_array
 from .sources import htod_src_arrays
-from .utilities import human_size, round32, timer
+from .utilities.utilities import human_size, round32, timer
+
+logger = logging.getLogger(__name__)
 
 
 class CPUUpdates:
diff --git a/gprMax/user_inputs.py b/gprMax/user_inputs.py
index f43ce6df..edd0b4b4 100644
--- a/gprMax/user_inputs.py
+++ b/gprMax/user_inputs.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,7 +22,7 @@ import gprMax.config as config
 import numpy as np
 
 from .subgrids.base import SubGridBase
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 logger = logging.getLogger(__name__)
 
diff --git a/gprMax/waveforms.py b/gprMax/waveforms.py
index 6651b509..fb1b9d13 100644
--- a/gprMax/waveforms.py
+++ b/gprMax/waveforms.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/setup.py b/setup.py
index 1cc29492..69c8c7b6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -111,7 +111,8 @@ with open('gprMax/_version.py', 'r') as fd:
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)
 
-# Parse package name from init file. Importing __init__.py / gprMax will break as gprMax depends on compiled .pyx files.
+# Parse package name from init file. Importing __init__.py / gprMax will break 
+# as gprMax depends on compiled .pyx files.
 with open('gprMax/__init__.py', 'r') as fd:
     packagename = re.search(r'^__name__\s*=\s*[\'"]([^\'"]*)[\'"]',
                             fd.read(), re.MULTILINE).group(1)
@@ -133,14 +134,16 @@ if 'build' in sys.argv:
     sys.argv.append('build_ext')
     sys.argv.append('--inplace')
 
-# Process '--no-cython' command line argument - either Cythonize or just compile the .c files
+# Process '--no-cython' command line argument - either Cythonize or just compile 
+# the .c files
 if '--no-cython' in sys.argv:
     USE_CYTHON = False
     sys.argv.remove('--no-cython')
 else:
     USE_CYTHON = True
 
-# Build a list of all the files that need to be Cythonized looking in gprMax directory
+# Build a list of all the files that need to be Cythonized looking in gprMax 
+# directory
 cythonfiles = []
 for root, dirs, files in os.walk(os.path.join(os.getcwd(), packagename), topdown=True):
     for file in files:
@@ -160,7 +163,9 @@ if 'cleanall' in sys.argv:
             except OSError:
                 print(f'Could not remove: {filebase + ".c"}')
         # Remove compiled Cython modules
-        libfile = glob.glob(os.path.join(os.getcwd(), os.path.splitext(file)[0]) + '*.pyd') + glob.glob(os.path.join(os.getcwd(), os.path.splitext(file)[0]) + '*.so')
+        libfile = glob.glob(os.path.join(os.getcwd(), 
+                            os.path.splitext(file)[0]) + '*.pyd') + glob.glob(os.path.join(os.getcwd(), 
+                            os.path.splitext(file)[0]) + '*.so')
         if libfile:
             libfile = libfile[0]
             try:
@@ -185,8 +190,8 @@ if sys.platform == 'win32':
     linker_args = []
     extra_objects = []
     libraries=[]
-# macOS - needs gcc (usually via HomeBrew) because the default compiler LLVM (clang) does not support OpenMP
-#          - with gcc -fopenmp option implies -pthread
+# macOS - needs gcc (usually via HomeBrew) because the default compiler LLVM 
+#           (clang) does not support OpenMP. With gcc -fopenmp option implies -pthread
 elif sys.platform == 'darwin':
     gccpath = glob.glob('/usr/local/bin/gcc-[4-9]*')
     gccpath += glob.glob('/usr/local/bin/gcc-[10-11]*')
@@ -241,7 +246,7 @@ if USE_CYTHON:
 
 setup(name=packagename,
       version=version,
-      author='Craig Warren and Antonis Giannopoulos',
+      author='Craig Warren, Antonis Giannopoulos, and John Hartley',
       url='http://www.gprmax.com',
       description='Electromagnetic Modelling Software based on the Finite-Difference Time-Domain (FDTD) method',
       long_description=long_description,
diff --git a/tests/analytical_solutions.py b/tests/analytical_solutions.py
index a465df66..56392f67 100644
--- a/tests/analytical_solutions.py
+++ b/tests/analytical_solutions.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/tests/benchmarking/plot_benchmark.py b/tests/benchmarking/plot_benchmark.py
index 7025e0f2..83932c5e 100644
--- a/tests/benchmarking/plot_benchmark.py
+++ b/tests/benchmarking/plot_benchmark.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -19,16 +19,14 @@
 import argparse
 import itertools
 import os
-import sys
 
-import h5py
 import matplotlib.pyplot as plt
 import matplotlib.gridspec as gridspec
 import numpy as np
 
 from gprMax._version import __version__
-from gprMax.utilities import get_host_info
-from gprMax.utilities import human_size
+from gprMax.utilities.host_info import get_host_info
+from gprMax.utilities.utilities import human_size
 
 
 """Plots execution times and speedup factors from benchmarking models run with different numbers of CPU (OpenMP) threads. Can also benchmark GPU(s) if required. Results are read from a NumPy archive."""
diff --git a/tests/test_experimental.py b/tests/test_experimental.py
index 09661c8f..0f3234b7 100644
--- a/tests/test_experimental.py
+++ b/tests/test_experimental.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -17,7 +17,6 @@
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
-import sys
 from pathlib import Path
 
 import h5py
diff --git a/tests/test_models.py b/tests/test_models.py
index 62dd2123..8d9eb4ea 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/tools/Paraview macros/gprMax.py b/tools/Paraview macros/gprMax.py
index aa249831..8220149d 100644
--- a/tools/Paraview macros/gprMax.py	
+++ b/tools/Paraview macros/gprMax.py	
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/tools/convert_png2h5.py b/tools/convert_png2h5.py
index 08da2dbb..68d10f71 100644
--- a/tools/convert_png2h5.py
+++ b/tools/convert_png2h5.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/tools/inputfile_old2new.py b/tools/inputfile_old2new.py
index d52604f1..61e985b3 100644
--- a/tools/inputfile_old2new.py
+++ b/tools/inputfile_old2new.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/tools/outputfiles_merge.py b/tools/outputfiles_merge.py
index a1b1789e..6e7efca9 100644
--- a/tools/outputfiles_merge.py
+++ b/tools/outputfiles_merge.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -25,7 +25,7 @@ from pathlib import Path
 import h5py
 import numpy as np
 from gprMax._version import __version__
-from gprMax.utilities import natural_keys
+from gprMax.utilities.utilities import natural_keys
 
 logger = logging.getLogger(__name__)
 
diff --git a/tools/plot_Ascan.py b/tools/plot_Ascan.py
index 142c72d6..2269ec8c 100644
--- a/tools/plot_Ascan.py
+++ b/tools/plot_Ascan.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -25,7 +25,7 @@ import matplotlib.gridspec as gridspec
 import matplotlib.pyplot as plt
 import numpy as np
 from gprMax.receivers import Rx
-from gprMax.utilities import fft_power
+from gprMax.utilities.utilities import fft_power
 
 logger = logging.getLogger(__name__)
 
diff --git a/tools/plot_Bscan.py b/tools/plot_Bscan.py
index 3b383d36..104d0fa1 100644
--- a/tools/plot_Bscan.py
+++ b/tools/plot_Bscan.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/tools/plot_antenna_params.py b/tools/plot_antenna_params.py
index 04ef835f..3ddf161a 100644
--- a/tools/plot_antenna_params.py
+++ b/tools/plot_antenna_params.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/tools/plot_antenna_params_UtEl.py b/tools/plot_antenna_params_UtEl.py
index 74ee0879..448895d2 100644
--- a/tools/plot_antenna_params_UtEl.py
+++ b/tools/plot_antenna_params_UtEl.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
diff --git a/tools/plot_source_wave.py b/tools/plot_source_wave.py
index c3a371ed..b456a2a1 100644
--- a/tools/plot_source_wave.py
+++ b/tools/plot_source_wave.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,7 +22,7 @@ from pathlib import Path
 
 import matplotlib.pyplot as plt
 import numpy as np
-from gprMax.utilities import fft_power, round_value
+from gprMax.utilities.utilities import fft_power, round_value
 from gprMax.waveforms import Waveform
 
 logger = logging.getLogger(__name__)