diff --git a/vtkm/exec/CMakeLists.txt b/vtkm/exec/CMakeLists.txt
index a8f13b578..50185bfdc 100644
--- a/vtkm/exec/CMakeLists.txt
+++ b/vtkm/exec/CMakeLists.txt
@@ -57,6 +57,3 @@ add_subdirectory(cuda)
 
 #-----------------------------------------------------------------------------
 add_subdirectory(testing)
-
-#-----------------------------------------------------------------------------
-add_subdirectory(cellmetrics)
diff --git a/vtkm/worklet/CMakeLists.txt b/vtkm/worklet/CMakeLists.txt
index 587d28771..317a1412d 100644
--- a/vtkm/worklet/CMakeLists.txt
+++ b/vtkm/worklet/CMakeLists.txt
@@ -118,6 +118,7 @@ set(sources_device
 
 #-----------------------------------------------------------------------------
 add_subdirectory(internal)
+add_subdirectory(cellmetrics)
 add_subdirectory(clip)
 add_subdirectory(colorconversion)
 add_subdirectory(connectivities)
diff --git a/vtkm/exec/cellmetrics/CMakeLists.txt b/vtkm/worklet/cellmetrics/CMakeLists.txt
similarity index 100%
rename from vtkm/exec/cellmetrics/CMakeLists.txt
rename to vtkm/worklet/cellmetrics/CMakeLists.txt
diff --git a/vtkm/exec/cellmetrics/CellDiagonalRatioMetric.h b/vtkm/worklet/cellmetrics/CellDiagonalRatioMetric.h
similarity index 100%
rename from vtkm/exec/cellmetrics/CellDiagonalRatioMetric.h
rename to vtkm/worklet/cellmetrics/CellDiagonalRatioMetric.h
diff --git a/vtkm/exec/cellmetrics/CellEdgeRatioMetric.h b/vtkm/worklet/cellmetrics/CellEdgeRatioMetric.h
similarity index 100%
rename from vtkm/exec/cellmetrics/CellEdgeRatioMetric.h
rename to vtkm/worklet/cellmetrics/CellEdgeRatioMetric.h
diff --git a/vtkm/exec/cellmetrics/CellJacobianMetric.h b/vtkm/worklet/cellmetrics/CellJacobianMetric.h
similarity index 100%
rename from vtkm/exec/cellmetrics/CellJacobianMetric.h
rename to vtkm/worklet/cellmetrics/CellJacobianMetric.h
diff --git a/vtkm/exec/cellmetrics/TypeOfCellHexahedral.h b/vtkm/worklet/cellmetrics/TypeOfCellHexahedral.h
similarity index 100%
rename from vtkm/exec/cellmetrics/TypeOfCellHexahedral.h
rename to vtkm/worklet/cellmetrics/TypeOfCellHexahedral.h
diff --git a/vtkm/exec/cellmetrics/TypeOfCellQuadrilateral.h b/vtkm/worklet/cellmetrics/TypeOfCellQuadrilateral.h
similarity index 100%
rename from vtkm/exec/cellmetrics/TypeOfCellQuadrilateral.h
rename to vtkm/worklet/cellmetrics/TypeOfCellQuadrilateral.h
diff --git a/vtkm/exec/cellmetrics/TypeOfCellTetrahedral.h b/vtkm/worklet/cellmetrics/TypeOfCellTetrahedral.h
similarity index 100%
rename from vtkm/exec/cellmetrics/TypeOfCellTetrahedral.h
rename to vtkm/worklet/cellmetrics/TypeOfCellTetrahedral.h
diff --git a/vtkm/exec/cellmetrics/TypeOfCellTriangle.h b/vtkm/worklet/cellmetrics/TypeOfCellTriangle.h
similarity index 100%
rename from vtkm/exec/cellmetrics/TypeOfCellTriangle.h
rename to vtkm/worklet/cellmetrics/TypeOfCellTriangle.h