diff --git a/cgridinterface.c b/opmcore/utility/cpgpreprocess/cgridinterface.c
similarity index 100%
rename from cgridinterface.c
rename to opmcore/utility/cpgpreprocess/cgridinterface.c
diff --git a/cgridinterface.h b/opmcore/utility/cpgpreprocess/cgridinterface.h
similarity index 100%
rename from cgridinterface.h
rename to opmcore/utility/cpgpreprocess/cgridinterface.h
diff --git a/facetopology.c b/opmcore/utility/cpgpreprocess/facetopology.c
similarity index 100%
rename from facetopology.c
rename to opmcore/utility/cpgpreprocess/facetopology.c
diff --git a/facetopology.h b/opmcore/utility/cpgpreprocess/facetopology.h
similarity index 100%
rename from facetopology.h
rename to opmcore/utility/cpgpreprocess/facetopology.h
diff --git a/geometry.c b/opmcore/utility/cpgpreprocess/geometry.c
similarity index 100%
rename from geometry.c
rename to opmcore/utility/cpgpreprocess/geometry.c
diff --git a/geometry.h b/opmcore/utility/cpgpreprocess/geometry.h
similarity index 100%
rename from geometry.h
rename to opmcore/utility/cpgpreprocess/geometry.h
diff --git a/grdecl.h b/opmcore/utility/cpgpreprocess/grdecl.h
similarity index 100%
rename from grdecl.h
rename to opmcore/utility/cpgpreprocess/grdecl.h
diff --git a/grid.h b/opmcore/utility/cpgpreprocess/grid.h
similarity index 100%
rename from grid.h
rename to opmcore/utility/cpgpreprocess/grid.h
diff --git a/mxgrdecl.c b/opmcore/utility/cpgpreprocess/mxgrdecl.c
similarity index 100%
rename from mxgrdecl.c
rename to opmcore/utility/cpgpreprocess/mxgrdecl.c
diff --git a/mxgrdecl.h b/opmcore/utility/cpgpreprocess/mxgrdecl.h
similarity index 100%
rename from mxgrdecl.h
rename to opmcore/utility/cpgpreprocess/mxgrdecl.h
diff --git a/preprocess.c b/opmcore/utility/cpgpreprocess/preprocess.c
similarity index 100%
rename from preprocess.c
rename to opmcore/utility/cpgpreprocess/preprocess.c
diff --git a/preprocess.h b/opmcore/utility/cpgpreprocess/preprocess.h
similarity index 100%
rename from preprocess.h
rename to opmcore/utility/cpgpreprocess/preprocess.h
diff --git a/processgrid.c b/opmcore/utility/cpgpreprocess/processgrid.c
similarity index 100%
rename from processgrid.c
rename to opmcore/utility/cpgpreprocess/processgrid.c
diff --git a/processgrid.m b/opmcore/utility/cpgpreprocess/processgrid.m
similarity index 100%
rename from processgrid.m
rename to opmcore/utility/cpgpreprocess/processgrid.m
diff --git a/readvector.cpp b/opmcore/utility/cpgpreprocess/readvector.cpp
similarity index 100%
rename from readvector.cpp
rename to opmcore/utility/cpgpreprocess/readvector.cpp
diff --git a/readvector.hpp b/opmcore/utility/cpgpreprocess/readvector.hpp
similarity index 100%
rename from readvector.hpp
rename to opmcore/utility/cpgpreprocess/readvector.hpp
diff --git a/scaneclipsedeck.c b/opmcore/utility/cpgpreprocess/scaneclipsedeck.c
similarity index 100%
rename from scaneclipsedeck.c
rename to opmcore/utility/cpgpreprocess/scaneclipsedeck.c
diff --git a/sparsetable.c b/opmcore/utility/cpgpreprocess/sparsetable.c
similarity index 100%
rename from sparsetable.c
rename to opmcore/utility/cpgpreprocess/sparsetable.c
diff --git a/sparsetable.h b/opmcore/utility/cpgpreprocess/sparsetable.h
similarity index 100%
rename from sparsetable.h
rename to opmcore/utility/cpgpreprocess/sparsetable.h
diff --git a/test_readvector.cpp b/opmcore/utility/cpgpreprocess/test_readvector.cpp
similarity index 100%
rename from test_readvector.cpp
rename to opmcore/utility/cpgpreprocess/test_readvector.cpp
diff --git a/uniquepoints.c b/opmcore/utility/cpgpreprocess/uniquepoints.c
similarity index 100%
rename from uniquepoints.c
rename to opmcore/utility/cpgpreprocess/uniquepoints.c
diff --git a/uniquepoints.h b/opmcore/utility/cpgpreprocess/uniquepoints.h
similarity index 100%
rename from uniquepoints.h
rename to opmcore/utility/cpgpreprocess/uniquepoints.h