diff --git a/pipeline_tools/contour_pixels.cpp b/pipeline_tools/libzobov/contour_pixels.cpp
similarity index 100%
rename from pipeline_tools/contour_pixels.cpp
rename to pipeline_tools/libzobov/contour_pixels.cpp
diff --git a/pipeline_tools/contour_pixels.hpp b/pipeline_tools/libzobov/contour_pixels.hpp
similarity index 100%
rename from pipeline_tools/contour_pixels.hpp
rename to pipeline_tools/libzobov/contour_pixels.hpp
diff --git a/pipeline_tools/gslIntegrate.hpp b/pipeline_tools/libzobov/gslIntegrate.hpp
similarity index 100%
rename from pipeline_tools/gslIntegrate.hpp
rename to pipeline_tools/libzobov/gslIntegrate.hpp
diff --git a/pipeline_tools/loadZobov.cpp b/pipeline_tools/libzobov/loadZobov.cpp
similarity index 100%
rename from pipeline_tools/loadZobov.cpp
rename to pipeline_tools/libzobov/loadZobov.cpp
diff --git a/pipeline_tools/loadZobov.hpp b/pipeline_tools/libzobov/loadZobov.hpp
similarity index 100%
rename from pipeline_tools/loadZobov.hpp
rename to pipeline_tools/libzobov/loadZobov.hpp
diff --git a/pipeline_tools/particleInfo.cpp b/pipeline_tools/libzobov/particleInfo.cpp
similarity index 100%
rename from pipeline_tools/particleInfo.cpp
rename to pipeline_tools/libzobov/particleInfo.cpp
diff --git a/pipeline_tools/particleInfo.hpp b/pipeline_tools/libzobov/particleInfo.hpp
similarity index 100%
rename from pipeline_tools/particleInfo.hpp
rename to pipeline_tools/libzobov/particleInfo.hpp
diff --git a/pipeline_tools/voidTree.hpp b/pipeline_tools/libzobov/voidTree.hpp
similarity index 100%
rename from pipeline_tools/voidTree.hpp
rename to pipeline_tools/libzobov/voidTree.hpp
diff --git a/pipeline_tools/generateFromCatalog.cpp b/pipeline_tools/mock/generateFromCatalog.cpp
similarity index 100%
rename from pipeline_tools/generateFromCatalog.cpp
rename to pipeline_tools/mock/generateFromCatalog.cpp
diff --git a/pipeline_tools/generateFromCatalog.ggo b/pipeline_tools/mock/generateFromCatalog.ggo
similarity index 100%
rename from pipeline_tools/generateFromCatalog.ggo
rename to pipeline_tools/mock/generateFromCatalog.ggo
diff --git a/pipeline_tools/generateMock.cpp b/pipeline_tools/mock/generateMock.cpp
similarity index 100%
rename from pipeline_tools/generateMock.cpp
rename to pipeline_tools/mock/generateMock.cpp
diff --git a/pipeline_tools/generateMock.ggo b/pipeline_tools/mock/generateMock.ggo
similarity index 100%
rename from pipeline_tools/generateMock.ggo
rename to pipeline_tools/mock/generateMock.ggo
diff --git a/pipeline_tools/generateTestMock.cpp b/pipeline_tools/mock/generateTestMock.cpp
similarity index 100%
rename from pipeline_tools/generateTestMock.cpp
rename to pipeline_tools/mock/generateTestMock.cpp