diff --git a/machines/cmake_macros/intel_aleph.cmake b/machines/aleph/intel_aleph.cmake
similarity index 100%
rename from machines/cmake_macros/intel_aleph.cmake
rename to machines/aleph/intel_aleph.cmake
diff --git a/machines/cmake_macros/athena.cmake b/machines/athena/athena.cmake
similarity index 100%
rename from machines/cmake_macros/athena.cmake
rename to machines/athena/athena.cmake
diff --git a/machines/cmake_macros/intel_athena.cmake b/machines/athena/intel_athena.cmake
similarity index 100%
rename from machines/cmake_macros/intel_athena.cmake
rename to machines/athena/intel_athena.cmake
diff --git a/machines/cmake_macros/intel_aws-hpc6a.cmake b/machines/aws-hpc6a/intel_aws-hpc6a.cmake
similarity index 100%
rename from machines/cmake_macros/intel_aws-hpc6a.cmake
rename to machines/aws-hpc6a/intel_aws-hpc6a.cmake
diff --git a/machines/cmake_macros/casper.cmake b/machines/casper/casper.cmake
similarity index 100%
rename from machines/cmake_macros/casper.cmake
rename to machines/casper/casper.cmake
diff --git a/machines/cmake_macros/intel_casper.cmake b/machines/casper/intel_casper.cmake
similarity index 100%
rename from machines/cmake_macros/intel_casper.cmake
rename to machines/casper/intel_casper.cmake
diff --git a/machines/cmake_macros/nvhpc_casper.cmake b/machines/casper/nvhpc_casper.cmake
similarity index 100%
rename from machines/cmake_macros/nvhpc_casper.cmake
rename to machines/casper/nvhpc_casper.cmake
diff --git a/machines/cmake_macros/pgi_casper.cmake b/machines/casper/pgi_casper.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_casper.cmake
rename to machines/casper/pgi_casper.cmake
diff --git a/machines/cmake_macros/centos7-linux.cmake b/machines/centos7-linux/centos7-linux.cmake
similarity index 100%
rename from machines/cmake_macros/centos7-linux.cmake
rename to machines/centos7-linux/centos7-linux.cmake
diff --git a/machines/cmake_macros/bluewaters.cmake b/machines/cmake_macros/bluewaters.cmake
deleted file mode 100644
index e69de29b..00000000
diff --git a/machines/cmake_macros/cheyenne.cmake b/machines/cmake_macros/cheyenne.cmake
deleted file mode 100644
index 35c2d3c3..00000000
--- a/machines/cmake_macros/cheyenne.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-if (COMP_NAME STREQUAL gptl)
-  string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
-endif()
-set(NETCDF_PATH "$ENV{NETCDF}")
-set(PIO_FILESYSTEM_HINTS "gpfs")
-set(PNETCDF_PATH "$ENV{PNETCDF}")
diff --git a/machines/cmake_macros/gnu_cheyenne.cmake b/machines/cmake_macros/gnu_cheyenne.cmake
deleted file mode 100644
index 988fbb33..00000000
--- a/machines/cmake_macros/gnu_cheyenne.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-if (COMP_NAME STREQUAL pio1)
-  string(APPEND CPPDEFS " -DNO_MPIMOD")
-endif()
-string(APPEND SLIBS " -ldl")
diff --git a/machines/cmake_macros/gnu_hobart.cmake b/machines/cmake_macros/gnu_hobart.cmake
deleted file mode 100644
index 35929dcc..00000000
--- a/machines/cmake_macros/gnu_hobart.cmake
+++ /dev/null
@@ -1 +0,0 @@
-string(APPEND SLIBS " -lm -ldl")
diff --git a/machines/cmake_macros/hobart.cmake b/machines/cmake_macros/hobart.cmake
deleted file mode 100644
index 8894b6a3..00000000
--- a/machines/cmake_macros/hobart.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-if (COMP_NAME STREQUAL gptl)
-  string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
-endif()
-set(LAPACK_LIBDIR "/usr/lib64")
-if (MPILIB STREQUAL mvapich2)
-  set(MPI_LIB_NAME "mpich")
-endif()
-set(NETCDF_PATH "$ENV{NETCDF_PATH}")
-string(APPEND SLIBS " -L${NETCDF_PATH}/lib -lnetcdff -lnetcdf")
diff --git a/machines/cmake_macros/ibm_BGQ.cmake b/machines/cmake_macros/ibm_BGQ.cmake
deleted file mode 100644
index 0f113a90..00000000
--- a/machines/cmake_macros/ibm_BGQ.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(CONFIG_ARGS "--build=powerpc-bgp-linux --host=powerpc64-suse-linux")
-string(APPEND CPPDEFS " -DLINUX")
-string(APPEND FFLAGS " -g -qfullpath -qmaxmem=-1 -qspillsize=2500 -qextname=flush")
-if (NOT DEBUG)
-  string(APPEND FFLAGS " -O3 -qstrict -qinline=auto")
-endif()
-if (NOT DEBUG AND compile_threaded)
-endif()
-if (DEBUG AND compile_threaded)
-endif()
-set(LDFLAGS "-Wl,--relax -Wl,--allow-multiple-definition")
diff --git a/machines/cmake_macros/intel_bluewaters.cmake b/machines/cmake_macros/intel_bluewaters.cmake
deleted file mode 100644
index 3cb50907..00000000
--- a/machines/cmake_macros/intel_bluewaters.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(HAS_F2008_CONTIGUOUS "FALSE")
-string(APPEND FFLAGS " -dynamic -mkl=sequential")
-string(APPEND CFLAGS " -dynamic -mkl=sequential")
diff --git a/machines/cmake_macros/intel_cheyenne.cmake b/machines/cmake_macros/intel_cheyenne.cmake
deleted file mode 100644
index b10bf277..00000000
--- a/machines/cmake_macros/intel_cheyenne.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-string(APPEND CFLAGS " -qopt-report -xCORE_AVX2")
-string(APPEND FFLAGS " -qopt-report -xCORE_AVX2")
-if (DEBUG)
-  string(APPEND CMAKE_OPTS " -DPIO_ENABLE_LOGGING=ON")
-endif()
-if (MPILIB STREQUAL mpi-serial AND NOT compile_threaded)
-  set(PFUNIT_PATH "$ENV{CESMDATAROOT}/tools/pFUnit/pFUnit4.7.0_cheyenne_Intel19.1.1_noMPI_noOpenMP")
-endif()
-set(HAS_F2008_CONTIGUOUS "TRUE")
diff --git a/machines/cmake_macros/intel_cori-haswell.cmake b/machines/cmake_macros/intel_cori-haswell.cmake
deleted file mode 100644
index 6fe65eb1..00000000
--- a/machines/cmake_macros/intel_cori-haswell.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(CONFIG_ARGS "--host=cray")
-string(APPEND CFLAGS " -xCORE-AVX2")
-string(APPEND FFLAGS " -xCORE-AVX2")
-string(APPEND SLIBS " -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf")
-if (COMP_NAME STREQUAL gptl)
-  string(APPEND CPPDEFS " -DHAVE_SLASHPROC")
-endif()
-string(APPEND LDFLAGS " -mkl")
-set(HAS_F2008_CONTIGUOUS "FALSE")
diff --git a/machines/cmake_macros/intel_cori-knl.cmake b/machines/cmake_macros/intel_cori-knl.cmake
deleted file mode 100644
index 683c1a80..00000000
--- a/machines/cmake_macros/intel_cori-knl.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(CONFIG_ARGS "--host=cray")
-string(APPEND CFLAGS " -xMIC-AVX512")
-string(APPEND FFLAGS " -xMIC-AVX512")
-string(APPEND SLIBS " -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf")
-if (COMP_NAME STREQUAL gptl)
-  string(APPEND CPPDEFS " -DHAVE_SLASHPROC")
-endif()
-string(APPEND LDFLAGS " -mkl -lmemkind -zmuldefs")
-set(HAS_F2008_CONTIGUOUS "FALSE")
diff --git a/machines/cmake_macros/intel_edison.cmake b/machines/cmake_macros/intel_edison.cmake
deleted file mode 100644
index 3f41409d..00000000
--- a/machines/cmake_macros/intel_edison.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-if (NOT DEBUG)
-  string(APPEND CFLAGS " -O2")
-endif()
-set(CONFIG_ARGS "--host=cray")
-if (COMP_NAME STREQUAL gptl)
-  string(APPEND CPPDEFS " -DHAVE_PAPI")
-endif()
-if (NOT DEBUG)
-  string(APPEND FFLAGS " -O2")
-endif()
-string(APPEND SLIBS " -L$ENV{NETCDF_DIR} -lnetcdff -Wl,--as-needed,-L$ENV{NETCDF_DIR}/lib -lnetcdff -lnetcdf")
diff --git a/machines/cmake_macros/intel_hobart.cmake b/machines/cmake_macros/intel_hobart.cmake
deleted file mode 100644
index b5782d88..00000000
--- a/machines/cmake_macros/intel_hobart.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-string(APPEND CFLAGS " -lifcore")
-string(APPEND FFLAGS " -lifcore")
-if (MPILIB STREQUAL mpi-serial)
-  string(APPEND FFLAGS " -mcmodel medium")
-endif()
-string(APPEND LDFLAGS " -lquadmath")
-string(APPEND LDFLAGS " -Wl,-rpath,${NETCDF_PATH}/lib")
-string(APPEND LDFLAGS " -Wl,-rpath,$ENV{COMPILER_PATH}/lib/intel64")
-string(APPEND LDFLAGS " -Wl,-rpath,$ENV{COMPILER_PATH}/mkl/lib/intel64")
-string(APPEND LDFLAGS " -Wl,-rpath,$ENV{MPI_PATH}/lib")
-string(APPEND LDFLAGS " -lifcore")
-if (MPILIB STREQUAL mvapich2)
-endif()
diff --git a/machines/cmake_macros/intel_laramie.cmake b/machines/cmake_macros/intel_laramie.cmake
deleted file mode 100644
index ba6a09da..00000000
--- a/machines/cmake_macros/intel_laramie.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-string(APPEND CFLAGS " -vec-report")
-string(APPEND FFLAGS " -vec-report")
-if (DEBUG)
-  string(APPEND CMAKE_OPTS " -DPIO_ENABLE_LOGGING=ON")
-endif()
diff --git a/machines/cmake_macros/laramie.cmake b/machines/cmake_macros/laramie.cmake
deleted file mode 100644
index 35c2d3c3..00000000
--- a/machines/cmake_macros/laramie.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-if (COMP_NAME STREQUAL gptl)
-  string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
-endif()
-set(NETCDF_PATH "$ENV{NETCDF}")
-set(PIO_FILESYSTEM_HINTS "gpfs")
-set(PNETCDF_PATH "$ENV{PNETCDF}")
diff --git a/machines/cmake_macros/nvhpc_cheyenne.cmake b/machines/cmake_macros/nvhpc_cheyenne.cmake
deleted file mode 100644
index e3769dd9..00000000
--- a/machines/cmake_macros/nvhpc_cheyenne.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-string(APPEND SLIBS " -llapack -lblas")
-if (MPILIB STREQUAL mpi-serial)
-  string(APPEND SLIBS " -ldl")
-endif()
diff --git a/machines/cmake_macros/pgi_bluewaters.cmake b/machines/cmake_macros/pgi_bluewaters.cmake
deleted file mode 100644
index ff5f1603..00000000
--- a/machines/cmake_macros/pgi_bluewaters.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-if (NOT DEBUG)
-  string(APPEND CFLAGS " -O2")
-endif()
-string(APPEND CFLAGS " -nofma")
-set(CXX_LIBS "-lmpichf90_pgi $ENV{PGI_PATH}/linux86-64/$ENV{PGI_VERSION}/lib/f90main.o")
-if (NOT DEBUG)
-  string(APPEND FFLAGS " -O2")
-endif()
-string(APPEND FFLAGS " -nofma")
-set(SUPPORTS_CXX "TRUE")
diff --git a/machines/cmake_macros/pgi_cheyenne.cmake b/machines/cmake_macros/pgi_cheyenne.cmake
deleted file mode 100644
index e3769dd9..00000000
--- a/machines/cmake_macros/pgi_cheyenne.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-string(APPEND SLIBS " -llapack -lblas")
-if (MPILIB STREQUAL mpi-serial)
-  string(APPEND SLIBS " -ldl")
-endif()
diff --git a/machines/cmake_macros/pgi_hobart.cmake b/machines/cmake_macros/pgi_hobart.cmake
deleted file mode 100644
index d3daece9..00000000
--- a/machines/cmake_macros/pgi_hobart.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-if (NOT DEBUG)
-  string(APPEND CFLAGS " -O0")
-endif()
-if (NOT DEBUG)
-  string(APPEND FFLAGS " -O0")
-endif()
-string(APPEND LDFLAGS " -lgomp")
-string(APPEND LDFLAGS " -Wl,-R${NETCDF_PATH}/lib")
-string(APPEND LDFLAGS " -Wl,-R$ENV{COMPILER_PATH}/lib")
-string(APPEND LDFLAGS " -Wl,-R$ENV{COMPILER_PATH}/libso")
diff --git a/machines/cmake_macros/gnu_coeus.cmake b/machines/coeus/gnu_coeus.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_coeus.cmake
rename to machines/coeus/gnu_coeus.cmake
diff --git a/machines/cmake_macros/intel_constance.cmake b/machines/constance/intel_constance.cmake
similarity index 100%
rename from machines/cmake_macros/intel_constance.cmake
rename to machines/constance/intel_constance.cmake
diff --git a/machines/cmake_macros/pgi_constance.cmake b/machines/constance/pgi_constance.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_constance.cmake
rename to machines/constance/pgi_constance.cmake
diff --git a/machines/cmake_macros/container.cmake b/machines/container/container.cmake
similarity index 100%
rename from machines/cmake_macros/container.cmake
rename to machines/container/container.cmake
diff --git a/machines/cmake_macros/cray_daint.cmake b/machines/daint/cray_daint.cmake
similarity index 100%
rename from machines/cmake_macros/cray_daint.cmake
rename to machines/daint/cray_daint.cmake
diff --git a/machines/cmake_macros/pgi_daint.cmake b/machines/daint/pgi_daint.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_daint.cmake
rename to machines/daint/pgi_daint.cmake
diff --git a/machines/cmake_macros/derecho.cmake b/machines/derecho/derecho.cmake
similarity index 100%
rename from machines/cmake_macros/derecho.cmake
rename to machines/derecho/derecho.cmake
diff --git a/machines/cmake_macros/intel-oneapi_derecho.cmake b/machines/derecho/intel-oneapi_derecho.cmake
similarity index 100%
rename from machines/cmake_macros/intel-oneapi_derecho.cmake
rename to machines/derecho/intel-oneapi_derecho.cmake
diff --git a/machines/cmake_macros/intel_derecho.cmake b/machines/derecho/intel_derecho.cmake
similarity index 100%
rename from machines/cmake_macros/intel_derecho.cmake
rename to machines/derecho/intel_derecho.cmake
diff --git a/machines/cmake_macros/nvhpc_derecho.cmake b/machines/derecho/nvhpc_derecho.cmake
similarity index 100%
rename from machines/cmake_macros/nvhpc_derecho.cmake
rename to machines/derecho/nvhpc_derecho.cmake
diff --git a/machines/cmake_macros/intel_eastwind.cmake b/machines/eastwind/intel_eastwind.cmake
similarity index 100%
rename from machines/cmake_macros/intel_eastwind.cmake
rename to machines/eastwind/intel_eastwind.cmake
diff --git a/machines/cmake_macros/pgi_eastwind.cmake b/machines/eastwind/pgi_eastwind.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_eastwind.cmake
rename to machines/eastwind/pgi_eastwind.cmake
diff --git a/machines/cmake_macros/euler2.cmake b/machines/euler2/euler2.cmake
similarity index 100%
rename from machines/cmake_macros/euler2.cmake
rename to machines/euler2/euler2.cmake
diff --git a/machines/cmake_macros/intel_euler2.cmake b/machines/euler2/intel_euler2.cmake
similarity index 100%
rename from machines/cmake_macros/intel_euler2.cmake
rename to machines/euler2/intel_euler2.cmake
diff --git a/machines/cmake_macros/pgi_euler2.cmake b/machines/euler2/pgi_euler2.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_euler2.cmake
rename to machines/euler2/pgi_euler2.cmake
diff --git a/machines/cmake_macros/euler3.cmake b/machines/euler3/euler3.cmake
similarity index 100%
rename from machines/cmake_macros/euler3.cmake
rename to machines/euler3/euler3.cmake
diff --git a/machines/cmake_macros/intel_euler3.cmake b/machines/euler3/intel_euler3.cmake
similarity index 100%
rename from machines/cmake_macros/intel_euler3.cmake
rename to machines/euler3/intel_euler3.cmake
diff --git a/machines/cmake_macros/pgi_euler3.cmake b/machines/euler3/pgi_euler3.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_euler3.cmake
rename to machines/euler3/pgi_euler3.cmake
diff --git a/machines/cmake_macros/euler4.cmake b/machines/euler4/euler4.cmake
similarity index 100%
rename from machines/cmake_macros/euler4.cmake
rename to machines/euler4/euler4.cmake
diff --git a/machines/cmake_macros/intel_euler4.cmake b/machines/euler4/intel_euler4.cmake
similarity index 100%
rename from machines/cmake_macros/intel_euler4.cmake
rename to machines/euler4/intel_euler4.cmake
diff --git a/machines/cmake_macros/pgi_euler4.cmake b/machines/euler4/pgi_euler4.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_euler4.cmake
rename to machines/euler4/pgi_euler4.cmake
diff --git a/machines/cmake_macros/frontera.cmake b/machines/frontera/frontera.cmake
similarity index 100%
rename from machines/cmake_macros/frontera.cmake
rename to machines/frontera/frontera.cmake
diff --git a/machines/cmake_macros/intel_greenplanet-sib29.cmake b/machines/greenplanet-sib29/intel_greenplanet-sib29.cmake
similarity index 100%
rename from machines/cmake_macros/intel_greenplanet-sib29.cmake
rename to machines/greenplanet-sib29/intel_greenplanet-sib29.cmake
diff --git a/machines/cmake_macros/intel_greenplanet-sky24.cmake b/machines/greenplanet-sky24/intel_greenplanet-sky24.cmake
similarity index 100%
rename from machines/cmake_macros/intel_greenplanet-sky24.cmake
rename to machines/greenplanet-sky24/intel_greenplanet-sky24.cmake
diff --git a/machines/cmake_macros/gust.cmake b/machines/gust/gust.cmake
similarity index 100%
rename from machines/cmake_macros/gust.cmake
rename to machines/gust/gust.cmake
diff --git a/machines/cmake_macros/intel_gust.cmake b/machines/gust/intel_gust.cmake
similarity index 100%
rename from machines/cmake_macros/intel_gust.cmake
rename to machines/gust/intel_gust.cmake
diff --git a/machines/cmake_macros/nvhpc_gust.cmake b/machines/gust/nvhpc_gust.cmake
similarity index 100%
rename from machines/cmake_macros/nvhpc_gust.cmake
rename to machines/gust/nvhpc_gust.cmake
diff --git a/machines/cmake_macros/gnu_homebrew.cmake b/machines/homebrew/gnu_homebrew.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_homebrew.cmake
rename to machines/homebrew/gnu_homebrew.cmake
diff --git a/machines/cmake_macros/intel_izumi.cmake b/machines/izumi/intel_izumi.cmake
similarity index 100%
rename from machines/cmake_macros/intel_izumi.cmake
rename to machines/izumi/intel_izumi.cmake
diff --git a/machines/cmake_macros/izumi.cmake b/machines/izumi/izumi.cmake
similarity index 100%
rename from machines/cmake_macros/izumi.cmake
rename to machines/izumi/izumi.cmake
diff --git a/machines/cmake_macros/pgi_izumi.cmake b/machines/izumi/pgi_izumi.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_izumi.cmake
rename to machines/izumi/pgi_izumi.cmake
diff --git a/machines/cmake_macros/intel_lawrencium-lr3.cmake b/machines/lawrencium-lr3/intel_lawrencium-lr3.cmake
similarity index 100%
rename from machines/cmake_macros/intel_lawrencium-lr3.cmake
rename to machines/lawrencium-lr3/intel_lawrencium-lr3.cmake
diff --git a/machines/cmake_macros/gnu_lobata.cmake b/machines/lobata/gnu_lobata.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_lobata.cmake
rename to machines/lobata/gnu_lobata.cmake
diff --git a/machines/cmake_macros/lonestar5.cmake b/machines/lonestar5/lonestar5.cmake
similarity index 100%
rename from machines/cmake_macros/lonestar5.cmake
rename to machines/lonestar5/lonestar5.cmake
diff --git a/machines/cmake_macros/gnu_melvin.cmake b/machines/melvin/gnu_melvin.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_melvin.cmake
rename to machines/melvin/gnu_melvin.cmake
diff --git a/machines/cmake_macros/gnu_modex.cmake b/machines/modex/gnu_modex.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_modex.cmake
rename to machines/modex/gnu_modex.cmake
diff --git a/machines/cmake_macros/pgi_olympus.cmake b/machines/olympus/pgi_olympus.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_olympus.cmake
rename to machines/olympus/pgi_olympus.cmake
diff --git a/machines/cmake_macros/pleiades-bro.cmake b/machines/pleiades-bro/pleiades-bro.cmake
similarity index 100%
rename from machines/cmake_macros/pleiades-bro.cmake
rename to machines/pleiades-bro/pleiades-bro.cmake
diff --git a/machines/cmake_macros/pleiades-has.cmake b/machines/pleiades-has/pleiades-has.cmake
similarity index 100%
rename from machines/cmake_macros/pleiades-has.cmake
rename to machines/pleiades-has/pleiades-has.cmake
diff --git a/machines/cmake_macros/pleiades-ivy.cmake b/machines/pleiades-ivy/pleiades-ivy.cmake
similarity index 100%
rename from machines/cmake_macros/pleiades-ivy.cmake
rename to machines/pleiades-ivy/pleiades-ivy.cmake
diff --git a/machines/cmake_macros/pleiades-san.cmake b/machines/pleiades-san/pleiades-san.cmake
similarity index 100%
rename from machines/cmake_macros/pleiades-san.cmake
rename to machines/pleiades-san/pleiades-san.cmake
diff --git a/machines/cmake_macros/intel_sandiatoss3.cmake b/machines/sandiatoss3/intel_sandiatoss3.cmake
similarity index 100%
rename from machines/cmake_macros/intel_sandiatoss3.cmake
rename to machines/sandiatoss3/intel_sandiatoss3.cmake
diff --git a/machines/cmake_macros/intel_stampede2-knl.cmake b/machines/stampede2-knl/intel_stampede2-knl.cmake
similarity index 100%
rename from machines/cmake_macros/intel_stampede2-knl.cmake
rename to machines/stampede2-knl/intel_stampede2-knl.cmake
diff --git a/machines/cmake_macros/stampede2-knl.cmake b/machines/stampede2-knl/stampede2-knl.cmake
similarity index 100%
rename from machines/cmake_macros/stampede2-knl.cmake
rename to machines/stampede2-knl/stampede2-knl.cmake
diff --git a/machines/cmake_macros/intel_stampede2-skx.cmake b/machines/stampede2-skx/intel_stampede2-skx.cmake
similarity index 100%
rename from machines/cmake_macros/intel_stampede2-skx.cmake
rename to machines/stampede2-skx/intel_stampede2-skx.cmake
diff --git a/machines/cmake_macros/stampede2-skx.cmake b/machines/stampede2-skx/stampede2-skx.cmake
similarity index 100%
rename from machines/cmake_macros/stampede2-skx.cmake
rename to machines/stampede2-skx/stampede2-skx.cmake
diff --git a/machines/cmake_macros/intel_theia.cmake b/machines/theia/intel_theia.cmake
similarity index 100%
rename from machines/cmake_macros/intel_theia.cmake
rename to machines/theia/intel_theia.cmake
diff --git a/machines/cmake_macros/theta.cmake b/machines/theta/theta.cmake
similarity index 100%
rename from machines/cmake_macros/theta.cmake
rename to machines/theta/theta.cmake
diff --git a/machines/cmake_macros/ubuntu-latest.cmake b/machines/ubuntu-latest/ubuntu-latest.cmake
similarity index 100%
rename from machines/cmake_macros/ubuntu-latest.cmake
rename to machines/ubuntu-latest/ubuntu-latest.cmake
diff --git a/machines/cmake_macros/intel_zeus.cmake b/machines/zeus/intel_zeus.cmake
similarity index 100%
rename from machines/cmake_macros/intel_zeus.cmake
rename to machines/zeus/intel_zeus.cmake
diff --git a/machines/cmake_macros/zeus.cmake b/machines/zeus/zeus.cmake
similarity index 100%
rename from machines/cmake_macros/zeus.cmake
rename to machines/zeus/zeus.cmake