diff --git a/src/libprojectM/BuiltinPresets.hpp b/src/libprojectM/BuiltinPresets.hpp
deleted file mode 100644
index 5129b92f2..000000000
--- a/src/libprojectM/BuiltinPresets.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __BUILTIN_PRESETS_HPP
-#define __BUILTIN_PRESETS_HPP
-#include "CompiledPreset.hpp"
-
-
-#include "MstressJuppyDancer.hpp"
-typedef CompiledPreset<MstressJumpyDancer>  MstressJumpyDancerPreset;
-
-#endif
\ No newline at end of file
diff --git a/src/libprojectM/BuiltinParams.cpp b/src/libprojectM/MilkdropPresetFactory/BuiltinParams.cpp
similarity index 100%
rename from src/libprojectM/BuiltinParams.cpp
rename to src/libprojectM/MilkdropPresetFactory/BuiltinParams.cpp
diff --git a/src/libprojectM/BuiltinParams.hpp b/src/libprojectM/MilkdropPresetFactory/BuiltinParams.hpp
similarity index 100%
rename from src/libprojectM/BuiltinParams.hpp
rename to src/libprojectM/MilkdropPresetFactory/BuiltinParams.hpp
diff --git a/src/libprojectM/CValue.hpp b/src/libprojectM/MilkdropPresetFactory/CValue.hpp
similarity index 100%
rename from src/libprojectM/CValue.hpp
rename to src/libprojectM/MilkdropPresetFactory/CValue.hpp
diff --git a/src/libprojectM/CustomShape.cpp b/src/libprojectM/MilkdropPresetFactory/CustomShape.cpp
similarity index 100%
rename from src/libprojectM/CustomShape.cpp
rename to src/libprojectM/MilkdropPresetFactory/CustomShape.cpp
diff --git a/src/libprojectM/CustomShape.hpp b/src/libprojectM/MilkdropPresetFactory/CustomShape.hpp
similarity index 100%
rename from src/libprojectM/CustomShape.hpp
rename to src/libprojectM/MilkdropPresetFactory/CustomShape.hpp
diff --git a/src/libprojectM/CustomWave.cpp b/src/libprojectM/MilkdropPresetFactory/CustomWave.cpp
similarity index 100%
rename from src/libprojectM/CustomWave.cpp
rename to src/libprojectM/MilkdropPresetFactory/CustomWave.cpp
diff --git a/src/libprojectM/CustomWave.hpp b/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp
similarity index 100%
rename from src/libprojectM/CustomWave.hpp
rename to src/libprojectM/MilkdropPresetFactory/CustomWave.hpp
diff --git a/src/libprojectM/Expr.cpp b/src/libprojectM/MilkdropPresetFactory/Expr.cpp
similarity index 100%
rename from src/libprojectM/Expr.cpp
rename to src/libprojectM/MilkdropPresetFactory/Expr.cpp
diff --git a/src/libprojectM/Expr.hpp b/src/libprojectM/MilkdropPresetFactory/Expr.hpp
similarity index 100%
rename from src/libprojectM/Expr.hpp
rename to src/libprojectM/MilkdropPresetFactory/Expr.hpp
diff --git a/src/libprojectM/Func.cpp b/src/libprojectM/MilkdropPresetFactory/Func.cpp
similarity index 100%
rename from src/libprojectM/Func.cpp
rename to src/libprojectM/MilkdropPresetFactory/Func.cpp
diff --git a/src/libprojectM/Func.hpp b/src/libprojectM/MilkdropPresetFactory/Func.hpp
similarity index 100%
rename from src/libprojectM/Func.hpp
rename to src/libprojectM/MilkdropPresetFactory/Func.hpp
diff --git a/src/libprojectM/InitCond.cpp b/src/libprojectM/MilkdropPresetFactory/InitCond.cpp
similarity index 100%
rename from src/libprojectM/InitCond.cpp
rename to src/libprojectM/MilkdropPresetFactory/InitCond.cpp
diff --git a/src/libprojectM/InitCond.hpp b/src/libprojectM/MilkdropPresetFactory/InitCond.hpp
similarity index 100%
rename from src/libprojectM/InitCond.hpp
rename to src/libprojectM/MilkdropPresetFactory/InitCond.hpp
diff --git a/src/libprojectM/InitCondUtils.hpp b/src/libprojectM/MilkdropPresetFactory/InitCondUtils.hpp
similarity index 100%
rename from src/libprojectM/InitCondUtils.hpp
rename to src/libprojectM/MilkdropPresetFactory/InitCondUtils.hpp
diff --git a/src/libprojectM/Param.cpp b/src/libprojectM/MilkdropPresetFactory/Param.cpp
similarity index 100%
rename from src/libprojectM/Param.cpp
rename to src/libprojectM/MilkdropPresetFactory/Param.cpp
diff --git a/src/libprojectM/Param.hpp b/src/libprojectM/MilkdropPresetFactory/Param.hpp
similarity index 100%
rename from src/libprojectM/Param.hpp
rename to src/libprojectM/MilkdropPresetFactory/Param.hpp
diff --git a/src/libprojectM/ParamUtils.hpp b/src/libprojectM/MilkdropPresetFactory/ParamUtils.hpp
similarity index 100%
rename from src/libprojectM/ParamUtils.hpp
rename to src/libprojectM/MilkdropPresetFactory/ParamUtils.hpp
diff --git a/src/libprojectM/PerFrameEqn.cpp b/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp
similarity index 100%
rename from src/libprojectM/PerFrameEqn.cpp
rename to src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp
diff --git a/src/libprojectM/PerFrameEqn.hpp b/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp
similarity index 100%
rename from src/libprojectM/PerFrameEqn.hpp
rename to src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp
diff --git a/src/libprojectM/PresetFrameIO.cpp b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
similarity index 100%
rename from src/libprojectM/PresetFrameIO.cpp
rename to src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
diff --git a/src/libprojectM/PresetFrameIO.hpp b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp
similarity index 100%
rename from src/libprojectM/PresetFrameIO.hpp
rename to src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp
diff --git a/src/libprojectM/MilkdropCompatability.hpp b/src/libprojectM/NativePresetFactory/MilkdropCompatability.hpp
similarity index 100%
rename from src/libprojectM/MilkdropCompatability.hpp
rename to src/libprojectM/NativePresetFactory/MilkdropCompatability.hpp