diff --git a/src/libprojectM/BuiltinFuncs.cpp b/src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.cpp
similarity index 100%
rename from src/libprojectM/BuiltinFuncs.cpp
rename to src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.cpp
diff --git a/src/libprojectM/BuiltinFuncs.hpp b/src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.hpp
similarity index 100%
rename from src/libprojectM/BuiltinFuncs.hpp
rename to src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.hpp
diff --git a/src/libprojectM/Eval.cpp b/src/libprojectM/MilkdropPresetFactory/Eval.cpp
similarity index 100%
rename from src/libprojectM/Eval.cpp
rename to src/libprojectM/MilkdropPresetFactory/Eval.cpp
diff --git a/src/libprojectM/Eval.hpp b/src/libprojectM/MilkdropPresetFactory/Eval.hpp
similarity index 100%
rename from src/libprojectM/Eval.hpp
rename to src/libprojectM/MilkdropPresetFactory/Eval.hpp
diff --git a/src/libprojectM/MilkdropPreset.cpp b/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp
similarity index 100%
rename from src/libprojectM/MilkdropPreset.cpp
rename to src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp
diff --git a/src/libprojectM/MilkdropPreset.hpp b/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp
similarity index 100%
rename from src/libprojectM/MilkdropPreset.hpp
rename to src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp
diff --git a/src/libprojectM/MilkdropPresetFactory.cpp b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp
similarity index 100%
rename from src/libprojectM/MilkdropPresetFactory.cpp
rename to src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp
diff --git a/src/libprojectM/MilkdropPresetFactory.hpp b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp
similarity index 100%
rename from src/libprojectM/MilkdropPresetFactory.hpp
rename to src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp
diff --git a/src/libprojectM/Parser.cpp b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
similarity index 100%
rename from src/libprojectM/Parser.cpp
rename to src/libprojectM/MilkdropPresetFactory/Parser.cpp
diff --git a/src/libprojectM/Parser.hpp b/src/libprojectM/MilkdropPresetFactory/Parser.hpp
similarity index 100%
rename from src/libprojectM/Parser.hpp
rename to src/libprojectM/MilkdropPresetFactory/Parser.hpp
diff --git a/src/libprojectM/PerPixelEqn.cpp b/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp
similarity index 100%
rename from src/libprojectM/PerPixelEqn.cpp
rename to src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp
diff --git a/src/libprojectM/PerPixelEqn.hpp b/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.hpp
similarity index 100%
rename from src/libprojectM/PerPixelEqn.hpp
rename to src/libprojectM/MilkdropPresetFactory/PerPixelEqn.hpp
diff --git a/src/libprojectM/PerPointEqn.cpp b/src/libprojectM/MilkdropPresetFactory/PerPointEqn.cpp
similarity index 100%
rename from src/libprojectM/PerPointEqn.cpp
rename to src/libprojectM/MilkdropPresetFactory/PerPointEqn.cpp
diff --git a/src/libprojectM/PerPointEqn.hpp b/src/libprojectM/MilkdropPresetFactory/PerPointEqn.hpp
similarity index 100%
rename from src/libprojectM/PerPointEqn.hpp
rename to src/libprojectM/MilkdropPresetFactory/PerPointEqn.hpp
diff --git a/src/libprojectM/NativePreset.hpp b/src/libprojectM/NativePresetFactory/NativePreset.hpp
similarity index 100%
rename from src/libprojectM/NativePreset.hpp
rename to src/libprojectM/NativePresetFactory/NativePreset.hpp
diff --git a/src/libprojectM/NativePresetFactory.cpp b/src/libprojectM/NativePresetFactory/NativePresetFactory.cpp
similarity index 100%
rename from src/libprojectM/NativePresetFactory.cpp
rename to src/libprojectM/NativePresetFactory/NativePresetFactory.cpp
diff --git a/src/libprojectM/NativePresetFactory.hpp b/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp
similarity index 100%
rename from src/libprojectM/NativePresetFactory.hpp
rename to src/libprojectM/NativePresetFactory/NativePresetFactory.hpp