diff --git a/software/lib/MMM/Music/Midi.cpp b/software/lib/MMM/Midi.cpp
similarity index 100%
rename from software/lib/MMM/Music/Midi.cpp
rename to software/lib/MMM/Midi.cpp
diff --git a/software/lib/MMM/Music/Midi.h b/software/lib/MMM/Midi.h
similarity index 100%
rename from software/lib/MMM/Music/Midi.h
rename to software/lib/MMM/Midi.h
diff --git a/software/lib/MMM/Motion.cpp b/software/lib/MMM/Motion.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/software/lib/MMM/Motion.h b/software/lib/MMM/Motion.h
new file mode 100644
index 0000000..e69de29
diff --git a/software/lib/MMM/Motor/Motor.cpp b/software/lib/MMM/Motor.cpp
similarity index 100%
rename from software/lib/MMM/Motor/Motor.cpp
rename to software/lib/MMM/Motor.cpp
diff --git a/software/lib/MMM/Motor/Motor.h b/software/lib/MMM/Motor.h
similarity index 100%
rename from software/lib/MMM/Motor/Motor.h
rename to software/lib/MMM/Motor.h
diff --git a/software/lib/MMM/Music/Music.cpp b/software/lib/MMM/Music.cpp
similarity index 100%
rename from software/lib/MMM/Music/Music.cpp
rename to software/lib/MMM/Music.cpp
diff --git a/software/lib/MMM/Music/Music.h b/software/lib/MMM/Music.h
similarity index 100%
rename from software/lib/MMM/Music/Music.h
rename to software/lib/MMM/Music.h
diff --git a/software/lib/MMM/Music/Wavetable.h b/software/lib/MMM/Wavetable.h
similarity index 100%
rename from software/lib/MMM/Music/Wavetable.h
rename to software/lib/MMM/Wavetable.h