diff --git a/Core/Tools/MathFunctions.cpp b/Core/Basics/MathFunctions.cpp
similarity index 100%
rename from Core/Tools/MathFunctions.cpp
rename to Core/Basics/MathFunctions.cpp
diff --git a/Core/Tools/MathFunctions.h b/Core/Basics/MathFunctions.h
similarity index 100%
rename from Core/Tools/MathFunctions.h
rename to Core/Basics/MathFunctions.h
diff --git a/Core/Tools/Convolve.cpp b/Core/Instrument/Convolve.cpp
similarity index 100%
rename from Core/Tools/Convolve.cpp
rename to Core/Instrument/Convolve.cpp
diff --git a/Core/Tools/Convolve.h b/Core/Instrument/Convolve.h
similarity index 100%
rename from Core/Tools/Convolve.h
rename to Core/Instrument/Convolve.h
diff --git a/Core/Tools/CumulativeValue.cpp b/Core/Instrument/CumulativeValue.cpp
similarity index 100%
rename from Core/Tools/CumulativeValue.cpp
rename to Core/Instrument/CumulativeValue.cpp
diff --git a/Core/Basics/CumulativeValue.h b/Core/Instrument/CumulativeValue.h
similarity index 100%
rename from Core/Basics/CumulativeValue.h
rename to Core/Instrument/CumulativeValue.h