diff --git a/include/sfizz/sfizz.h b/src/sfizz.h similarity index 100% rename from include/sfizz/sfizz.h rename to src/sfizz.h diff --git a/include/sfizz/sfizz.hpp b/src/sfizz.hpp similarity index 100% rename from include/sfizz/sfizz.hpp rename to src/sfizz.hpp diff --git a/src/ADSREnvelope.cpp b/src/sfizz/ADSREnvelope.cpp similarity index 100% rename from src/ADSREnvelope.cpp rename to src/sfizz/ADSREnvelope.cpp diff --git a/src/ADSREnvelope.h b/src/sfizz/ADSREnvelope.h similarity index 100% rename from src/ADSREnvelope.h rename to src/sfizz/ADSREnvelope.h diff --git a/src/AtomicGuard.h b/src/sfizz/AtomicGuard.h similarity index 100% rename from src/AtomicGuard.h rename to src/sfizz/AtomicGuard.h diff --git a/src/AudioBuffer.h b/src/sfizz/AudioBuffer.h similarity index 100% rename from src/AudioBuffer.h rename to src/sfizz/AudioBuffer.h diff --git a/src/AudioSpan.h b/src/sfizz/AudioSpan.h similarity index 100% rename from src/AudioSpan.h rename to src/sfizz/AudioSpan.h diff --git a/src/Buffer.h b/src/sfizz/Buffer.h similarity index 100% rename from src/Buffer.h rename to src/sfizz/Buffer.h diff --git a/src/CCMap.h b/src/sfizz/CCMap.h similarity index 100% rename from src/CCMap.h rename to src/sfizz/CCMap.h diff --git a/src/Config.h b/src/sfizz/Config.h similarity index 100% rename from src/Config.h rename to src/sfizz/Config.h diff --git a/src/Debug.h b/src/sfizz/Debug.h similarity index 100% rename from src/Debug.h rename to src/sfizz/Debug.h diff --git a/src/Defaults.h b/src/sfizz/Defaults.h similarity index 100% rename from src/Defaults.h rename to src/sfizz/Defaults.h diff --git a/src/EGDescription.h b/src/sfizz/EGDescription.h similarity index 100% rename from src/EGDescription.h rename to src/sfizz/EGDescription.h diff --git a/src/FilePool.cpp b/src/sfizz/FilePool.cpp similarity index 100% rename from src/FilePool.cpp rename to src/sfizz/FilePool.cpp diff --git a/src/FilePool.h b/src/sfizz/FilePool.h similarity index 100% rename from src/FilePool.h rename to src/sfizz/FilePool.h diff --git a/src/FloatEnvelopes.cpp b/src/sfizz/FloatEnvelopes.cpp similarity index 100% rename from src/FloatEnvelopes.cpp rename to src/sfizz/FloatEnvelopes.cpp diff --git a/src/HistoricalBuffer.h b/src/sfizz/HistoricalBuffer.h similarity index 100% rename from src/HistoricalBuffer.h rename to src/sfizz/HistoricalBuffer.h diff --git a/src/LeakDetector.h b/src/sfizz/LeakDetector.h similarity index 100% rename from src/LeakDetector.h rename to src/sfizz/LeakDetector.h diff --git a/src/LinearEnvelope.cpp b/src/sfizz/LinearEnvelope.cpp similarity index 100% rename from src/LinearEnvelope.cpp rename to src/sfizz/LinearEnvelope.cpp diff --git a/src/LinearEnvelope.h b/src/sfizz/LinearEnvelope.h similarity index 100% rename from src/LinearEnvelope.h rename to src/sfizz/LinearEnvelope.h diff --git a/src/MathHelpers.h b/src/sfizz/MathHelpers.h similarity index 100% rename from src/MathHelpers.h rename to src/sfizz/MathHelpers.h diff --git a/src/MidiState.h b/src/sfizz/MidiState.h similarity index 100% rename from src/MidiState.h rename to src/sfizz/MidiState.h diff --git a/src/OnePoleFilter.h b/src/sfizz/OnePoleFilter.h similarity index 100% rename from src/OnePoleFilter.h rename to src/sfizz/OnePoleFilter.h diff --git a/src/Opcode.cpp b/src/sfizz/Opcode.cpp similarity index 100% rename from src/Opcode.cpp rename to src/sfizz/Opcode.cpp diff --git a/src/Opcode.h b/src/sfizz/Opcode.h similarity index 100% rename from src/Opcode.h rename to src/sfizz/Opcode.h diff --git a/src/Parser.cpp b/src/sfizz/Parser.cpp similarity index 100% rename from src/Parser.cpp rename to src/sfizz/Parser.cpp diff --git a/src/Parser.h b/src/sfizz/Parser.h similarity index 100% rename from src/Parser.h rename to src/sfizz/Parser.h diff --git a/src/Range.h b/src/sfizz/Range.h similarity index 100% rename from src/Range.h rename to src/sfizz/Range.h diff --git a/src/Regexes.h b/src/sfizz/Regexes.h similarity index 100% rename from src/Regexes.h rename to src/sfizz/Regexes.h diff --git a/src/Region.cpp b/src/sfizz/Region.cpp similarity index 100% rename from src/Region.cpp rename to src/sfizz/Region.cpp diff --git a/src/Region.h b/src/sfizz/Region.h similarity index 100% rename from src/Region.h rename to src/sfizz/Region.h diff --git a/src/SIMDDummy.cpp b/src/sfizz/SIMDDummy.cpp similarity index 100% rename from src/SIMDDummy.cpp rename to src/sfizz/SIMDDummy.cpp diff --git a/src/SIMDHelpers.h b/src/sfizz/SIMDHelpers.h similarity index 100% rename from src/SIMDHelpers.h rename to src/sfizz/SIMDHelpers.h diff --git a/src/SIMDSSE.cpp b/src/sfizz/SIMDSSE.cpp similarity index 100% rename from src/SIMDSSE.cpp rename to src/sfizz/SIMDSSE.cpp diff --git a/src/ScopedFTZ.cpp b/src/sfizz/ScopedFTZ.cpp similarity index 100% rename from src/ScopedFTZ.cpp rename to src/sfizz/ScopedFTZ.cpp diff --git a/src/ScopedFTZ.h b/src/sfizz/ScopedFTZ.h similarity index 100% rename from src/ScopedFTZ.h rename to src/sfizz/ScopedFTZ.h diff --git a/src/SfzHelpers.cpp b/src/sfizz/SfzHelpers.cpp similarity index 100% rename from src/SfzHelpers.cpp rename to src/sfizz/SfzHelpers.cpp diff --git a/src/SfzHelpers.h b/src/sfizz/SfzHelpers.h similarity index 100% rename from src/SfzHelpers.h rename to src/sfizz/SfzHelpers.h diff --git a/src/StringViewHelpers.h b/src/sfizz/StringViewHelpers.h similarity index 100% rename from src/StringViewHelpers.h rename to src/sfizz/StringViewHelpers.h diff --git a/src/Synth.cpp b/src/sfizz/Synth.cpp similarity index 100% rename from src/Synth.cpp rename to src/sfizz/Synth.cpp diff --git a/src/Synth.h b/src/sfizz/Synth.h similarity index 100% rename from src/Synth.h rename to src/sfizz/Synth.h diff --git a/src/Voice.cpp b/src/sfizz/Voice.cpp similarity index 100% rename from src/Voice.cpp rename to src/sfizz/Voice.cpp diff --git a/src/Voice.h b/src/sfizz/Voice.h similarity index 100% rename from src/Voice.h rename to src/sfizz/Voice.h diff --git a/src/sfizz_wrapper.cpp b/src/sfizz/sfizz_wrapper.cpp similarity index 100% rename from src/sfizz_wrapper.cpp rename to src/sfizz/sfizz_wrapper.cpp