diff --git a/impl/game/main.cpp b/impl/game/main.cpp
index 4628fbd2..60cb3c10 100644
--- a/impl/game/main.cpp
+++ b/impl/game/main.cpp
@@ -1,8 +1,9 @@
 #include "main.hpp"
 #include <action_commands/action_command_manager.hpp>
 #include <action_commands/basic_action_commands.hpp>
-#include <audio/audio_impl.hpp>
-#include <audio/logging_audio.hpp>
+#include <audio/audio/audio_impl.hpp>
+#include <audio/audio/logging_audio.hpp>
+#include <audio/fades/logging_sound_fade_manager.hpp>
 #include <cache_impl.hpp>
 #include <camera.hpp>
 #include <game.hpp>
@@ -54,7 +55,8 @@ int main()
     auto const gamepad0 = std::make_shared<jt::GamepadInput>(0);
     jt::InputManager input { mouse, keyboard, { gamepad0 } };
 
-    jt::AudioImpl audio;
+    jt::SoundFadeManager fades;
+    jt::AudioImpl audio { std::make_unique<jt::LoggingSoundFadeManager>(fades, logger) };
     jt::LoggingAudio loggingAudio { audio, logger };
 
     jt::StateManager stateManager { std::make_shared<StateIntro>() };
diff --git a/impl/gamelib/player/sound/sound_component_impl.cpp b/impl/gamelib/player/sound/sound_component_impl.cpp
index aad07973..8a8a7a5c 100644
--- a/impl/gamelib/player/sound/sound_component_impl.cpp
+++ b/impl/gamelib/player/sound/sound_component_impl.cpp
@@ -1,10 +1,11 @@
 #include "sound_component_impl.hpp"
-#include <audio/logging_sound.hpp>
-#include <audio/sound.hpp>
-#include <audio/sound_group.hpp>
-#include <audio/sound_null.hpp>
+#include <audio/sound/logging_sound.hpp>
+#include <audio/sound/sound.hpp>
+#include <audio/sound/sound_group.hpp>
+#include <audio/sound/sound_null.hpp>
 
-SoundComponentImpl::SoundComponentImpl(jt::AudioInterface& /*audio*/, jt::LoggerInterface& /*logger*/)
+SoundComponentImpl::SoundComponentImpl(
+    jt::AudioInterface& /*audio*/, jt::LoggerInterface& /*logger*/)
 {
     // TODO load Sounds
 }
diff --git a/impl/gamelib/player/sound/sound_component_impl.hpp b/impl/gamelib/player/sound/sound_component_impl.hpp
index b2aed667..9ce78095 100644
--- a/impl/gamelib/player/sound/sound_component_impl.hpp
+++ b/impl/gamelib/player/sound/sound_component_impl.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_PLAYER_SOUND_COMPONENT_HPP
 #define GAME_PLAYER_SOUND_COMPONENT_HPP
 
-#include <audio/audio_interface.hpp>
+#include <audio/audio/audio_interface.hpp>
 #include <log/logger_interface.hpp>
 #include <player/sound/sound_component_interface.hpp>
 
diff --git a/impl/gamelib/state_intro.cpp b/impl/gamelib/state_intro.cpp
index 37c5b886..c6833cac 100644
--- a/impl/gamelib/state_intro.cpp
+++ b/impl/gamelib/state_intro.cpp
@@ -1,5 +1,5 @@
 #include "state_intro.hpp"
-#include <audio/sound.hpp>
+#include <audio/sound/sound.hpp>
 #include <game_interface.hpp>
 #include <game_properties.hpp>
 #include <state_menu.hpp>
@@ -22,7 +22,7 @@ void StateIntro::onEnter()
     jt::Vector2f const endPos { GP::GetScreenSize().x / 2, GP::GetScreenSize().y / 2 };
     m_sprite->setPosition(startPos);
     m_sprite->update(0.0f);
-    
+
     auto twp = jt::TweenPosition::create(m_sprite, 0.8f, startPos, endPos);
     add(twp);
 
diff --git a/impl/gamelib/state_intro.hpp b/impl/gamelib/state_intro.hpp
index 522cbfbf..a7a4fdfb 100644
--- a/impl/gamelib/state_intro.hpp
+++ b/impl/gamelib/state_intro.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_STATE_INTRO_HPP
 #define JAMTEMPLATE_STATE_INTRO_HPP
 
-#include <audio/sound_interface.hpp>
+#include <audio/sound/sound_interface.hpp>
 #include <game_state.hpp>
 #include <sprite.hpp>
 #include <memory>
diff --git a/impl/jamtemplate/common/audio/audio_impl.cpp b/impl/jamtemplate/common/audio/audio/audio_impl.cpp
similarity index 87%
rename from impl/jamtemplate/common/audio/audio_impl.cpp
rename to impl/jamtemplate/common/audio/audio/audio_impl.cpp
index 1340c5d3..5c12cbdb 100644
--- a/impl/jamtemplate/common/audio/audio_impl.cpp
+++ b/impl/jamtemplate/common/audio/audio/audio_impl.cpp
@@ -1,11 +1,19 @@
 #include "audio_impl.hpp"
-#include <audio/intro_looping_sound_with_effect.hpp>
-#include <audio/sound.hpp>
-#include <audio/sound_group.hpp>
-#include <audio/sound_with_effect.hpp>
+#include <audio/sound/intro_looping_sound_with_effect.hpp>
+#include <audio/sound/sound.hpp>
+#include <audio/sound/sound_group.hpp>
+#include <audio/sound/sound_with_effect.hpp>
 #include <random/random.hpp>
 #include <algorithm>
 
+jt::AudioImpl::AudioImpl(std::unique_ptr<SoundFadeManagerInterface> soundFadeManager)
+    : m_fades { std::move(soundFadeManager) }
+{
+    if (!m_fades) {
+        m_fades = std::make_unique<SoundFadeManager>();
+    }
+}
+
 jt::AudioImpl::~AudioImpl() { m_temporarySounds.clear(); }
 
 void jt::AudioImpl::update(float elapsed)
@@ -105,5 +113,5 @@ std::shared_ptr<jt::SoundInterface> jt::AudioImpl::addTemporarySoundGroup(
     return group;
 }
 
-jt::SoundFadeManager& jt::AudioImpl::fades() { return *m_fades; }
+jt::SoundFadeManagerInterface& jt::AudioImpl::fades() { return *m_fades; }
 jt::GroupVolumeSetterInterface& jt::AudioImpl::groups() { return m_volumeGroups; }
diff --git a/impl/jamtemplate/common/audio/audio_impl.hpp b/impl/jamtemplate/common/audio/audio/audio_impl.hpp
similarity index 84%
rename from impl/jamtemplate/common/audio/audio_impl.hpp
rename to impl/jamtemplate/common/audio/audio/audio_impl.hpp
index 63fad400..d50977b2 100644
--- a/impl/jamtemplate/common/audio/audio_impl.hpp
+++ b/impl/jamtemplate/common/audio/audio/audio_impl.hpp
@@ -1,8 +1,9 @@
 #ifndef JAMTEMPLATE_AUDIO_IMPL_HPP
 #define JAMTEMPLATE_AUDIO_IMPL_HPP
 
-#include <audio/audio_interface.hpp>
-#include <audio/group_volume_manager.hpp>
+#include <audio/audio/audio_interface.hpp>
+#include <audio/fades/sound_fade_manager.hpp>
+#include <audio/sound_groups/group_volume_manager.hpp>
 #include <oalpp/sound_context.hpp>
 #include <map>
 #include <vector>
@@ -10,6 +11,7 @@
 namespace jt {
 class AudioImpl : public AudioInterface {
 public:
+    AudioImpl(std::unique_ptr<SoundFadeManagerInterface> soundFadeManager = nullptr);
     ~AudioImpl();
 
     void update(float elapsed) override;
@@ -35,7 +37,7 @@ class AudioImpl : public AudioInterface {
 
     oalpp::SoundContextInterface& getContext() override;
 
-    SoundFadeManager& fades() override;
+    SoundFadeManagerInterface& fades() override;
 
     GroupVolumeSetterInterface& groups() override;
 
@@ -45,7 +47,7 @@ class AudioImpl : public AudioInterface {
     std::vector<std::weak_ptr<jt::SoundInterface>> m_temporarySounds {};
     std::map<std::string, std::shared_ptr<jt::SoundInterface>> m_permanentSounds {};
 
-    std::unique_ptr<SoundFadeManager> m_fades { std::make_unique<SoundFadeManager>() };
+    std::unique_ptr<SoundFadeManagerInterface> m_fades;
 
     GroupVolumeManager m_volumeGroups;
 
diff --git a/impl/jamtemplate/common/audio/audio_interface.cpp b/impl/jamtemplate/common/audio/audio/audio_interface.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/audio_interface.cpp
rename to impl/jamtemplate/common/audio/audio/audio_interface.cpp
diff --git a/impl/jamtemplate/common/audio/audio_interface.hpp b/impl/jamtemplate/common/audio/audio/audio_interface.hpp
similarity index 93%
rename from impl/jamtemplate/common/audio/audio_interface.hpp
rename to impl/jamtemplate/common/audio/audio/audio_interface.hpp
index 0322ed89..f21fc708 100644
--- a/impl/jamtemplate/common/audio/audio_interface.hpp
+++ b/impl/jamtemplate/common/audio/audio/audio_interface.hpp
@@ -1,11 +1,11 @@
 #ifndef JAMTEMPLATE_AUDIO_INTERFACE_HPP
 #define JAMTEMPLATE_AUDIO_INTERFACE_HPP
 
-#include <audio/group_volume_setter_interface.hpp>
-#include <audio/sound.hpp>
-#include <audio/sound_fade_manager.hpp>
-#include <audio/sound_interface.hpp>
-#include <audio/sound_with_effect.hpp>
+#include <audio/fades/sound_fade_manager_interface.hpp>
+#include <audio/sound/sound.hpp>
+#include <audio/sound/sound_interface.hpp>
+#include <audio/sound/sound_with_effect.hpp>
+#include <audio/sound_groups/group_volume_setter_interface.hpp>
 #include <oalpp/sound_context/sound_context_interface.hpp>
 #include <functional>
 #include <memory>
@@ -86,7 +86,7 @@ class AudioInterface {
 
     /// Get the SoundFadeManager
     /// \return the SoundFadeManager
-    virtual jt::SoundFadeManager& fades() = 0;
+    virtual jt::SoundFadeManagerInterface& fades() = 0;
 
     /// Get the GroupVolumes
     /// \return the GroupVolumeSetter
diff --git a/impl/jamtemplate/common/audio/audio_null.cpp b/impl/jamtemplate/common/audio/audio/audio_null.cpp
similarity index 92%
rename from impl/jamtemplate/common/audio/audio_null.cpp
rename to impl/jamtemplate/common/audio/audio/audio_null.cpp
index 66738da3..aa566705 100644
--- a/impl/jamtemplate/common/audio/audio_null.cpp
+++ b/impl/jamtemplate/common/audio/audio/audio_null.cpp
@@ -1,8 +1,9 @@
 #include "audio_null.hpp"
-#include <audio/sound_group.hpp>
-#include <audio/sound_null.hpp>
+#include <audio/sound/sound_group.hpp>
+#include <audio/sound/sound_null.hpp>
 
 void jt::AudioNull::update(float /*elapsed*/) { }
+
 oalpp::SoundContextInterface& jt::AudioNull::getContext() { return m_context; }
 
 std::shared_ptr<jt::SoundInterface> jt::AudioNull::soundPool(
@@ -30,12 +31,14 @@ std::shared_ptr<jt::SoundInterface> jt::AudioNull::addPermanentSound(
 {
     return std::make_shared<jt::SoundNull>();
 }
+
 std::shared_ptr<jt::SoundInterface> jt::AudioNull::addPermanentSound(
     std::string const& /*identifier*/, std::string const& /*fileName*/,
     oalpp::effects::MonoEffectInterface& /*effect*/)
 {
     return std::make_shared<jt::SoundNull>();
 }
+
 std::shared_ptr<jt::SoundInterface> jt::AudioNull::addPermanentSound(
     std::string const& /*identifier*/, std::string const& /*introFileName*/,
     std::string const& /*loopingFileName*/, oalpp::effects::MonoEffectInterface& /*effect*/)
@@ -55,5 +58,5 @@ std::shared_ptr<jt::SoundInterface> jt::AudioNull::addTemporarySoundGroup(
 
     return group;
 }
-jt::SoundFadeManager& jt::AudioNull::fades() { return m_fades; }
+jt::SoundFadeManagerInterface& jt::AudioNull::fades() { return *m_fades; }
 jt::GroupVolumeSetterInterface& jt::AudioNull::groups() { return m_groups; }
diff --git a/impl/jamtemplate/common/audio/audio_null.hpp b/impl/jamtemplate/common/audio/audio/audio_null.hpp
similarity index 85%
rename from impl/jamtemplate/common/audio/audio_null.hpp
rename to impl/jamtemplate/common/audio/audio/audio_null.hpp
index 320da0a7..90a50f4d 100644
--- a/impl/jamtemplate/common/audio/audio_null.hpp
+++ b/impl/jamtemplate/common/audio/audio/audio_null.hpp
@@ -1,8 +1,9 @@
 #ifndef JAMTEMPLATE_AUDIO_NULL_HPP
 #define JAMTEMPLATE_AUDIO_NULL_HPP
 
-#include <audio/audio_interface.hpp>
-#include <audio/group_volume_manager.hpp>
+#include <audio/audio/audio_interface.hpp>
+#include <audio/fades/sound_fade_manager.hpp>
+#include <audio/sound_groups/group_volume_manager.hpp>
 
 namespace jt {
 
@@ -37,13 +38,13 @@ class AudioNull : public AudioInterface {
     std::shared_ptr<jt::SoundInterface> addTemporarySoundGroup(
         std::vector<std::shared_ptr<jt::SoundInterface>> const& sounds) override;
 
-    SoundFadeManager& fades() override;
+    SoundFadeManagerInterface& fades() override;
     GroupVolumeSetterInterface& groups() override;
 
 private:
     null_objects::SoundContextNull m_context;
 
-    SoundFadeManager m_fades;
+    std::unique_ptr<SoundFadeManagerInterface> m_fades { std::make_unique<SoundFadeManager>() };
     GroupVolumeManager m_groups;
 };
 } // namespace jt
diff --git a/impl/jamtemplate/common/audio/logging_audio.cpp b/impl/jamtemplate/common/audio/audio/logging_audio.cpp
similarity index 97%
rename from impl/jamtemplate/common/audio/logging_audio.cpp
rename to impl/jamtemplate/common/audio/audio/logging_audio.cpp
index 3c80d262..2e430977 100644
--- a/impl/jamtemplate/common/audio/logging_audio.cpp
+++ b/impl/jamtemplate/common/audio/audio/logging_audio.cpp
@@ -1,5 +1,5 @@
 #include "logging_audio.hpp"
-#include <audio/logging_sound.hpp>
+#include <audio/sound/logging_sound.hpp>
 
 jt::LoggingAudio::LoggingAudio(jt::AudioInterface& decoratee, jt::LoggerInterface& logger)
     : m_decoratee { decoratee }
@@ -75,11 +75,13 @@ std::shared_ptr<jt::SoundInterface> jt::LoggingAudio::addTemporarySoundGroup(
         { "jt", "audio" });
     return std::make_shared<jt::LoggingSound>(m_decoratee.addTemporarySoundGroup(sounds), m_logger);
 }
-jt::SoundFadeManager& jt::LoggingAudio::fades()
+
+jt::SoundFadeManagerInterface& jt::LoggingAudio::fades()
 {
     m_logger.verbose("fades", { "jt", "audio" });
     return m_decoratee.fades();
 }
+
 jt::GroupVolumeSetterInterface& jt::LoggingAudio::groups()
 {
     m_logger.verbose("groups", { "jt", "audio", "sound groups" });
diff --git a/impl/jamtemplate/common/audio/logging_audio.hpp b/impl/jamtemplate/common/audio/audio/logging_audio.hpp
similarity index 94%
rename from impl/jamtemplate/common/audio/logging_audio.hpp
rename to impl/jamtemplate/common/audio/audio/logging_audio.hpp
index ba3ca40b..1209174f 100644
--- a/impl/jamtemplate/common/audio/logging_audio.hpp
+++ b/impl/jamtemplate/common/audio/audio/logging_audio.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_LOGGING_AUDIO_HPP
 #define JAMTEMPLATE_LOGGING_AUDIO_HPP
 
-#include <audio/audio_interface.hpp>
+#include <audio/audio/audio_interface.hpp>
 #include <log/logger_interface.hpp>
 
 namespace jt {
@@ -32,7 +32,7 @@ class LoggingAudio : public AudioInterface {
 
     oalpp::SoundContextInterface& getContext() override;
 
-    SoundFadeManager& fades() override;
+    SoundFadeManagerInterface& fades() override;
     GroupVolumeSetterInterface& groups() override;
 
 private:
diff --git a/impl/jamtemplate/common/audio/fades/logging_sound_fade_manager.cpp b/impl/jamtemplate/common/audio/fades/logging_sound_fade_manager.cpp
new file mode 100644
index 00000000..a42ac89f
--- /dev/null
+++ b/impl/jamtemplate/common/audio/fades/logging_sound_fade_manager.cpp
@@ -0,0 +1,23 @@
+#include "logging_sound_fade_manager.hpp"
+
+jt::LoggingSoundFadeManager::LoggingSoundFadeManager(
+    SoundFadeManagerInterface& decoratee, LoggerInterface& logger)
+    : m_decoratee { decoratee }
+    , m_logger { logger }
+{
+}
+
+void jt::LoggingSoundFadeManager::volumeFade(std::weak_ptr<SoundInterface> sound,
+    float durationInSeconds, float startVolume, float endVolume)
+{
+    m_logger.info("Create sound fade", { "jt", "audio", "sound fade" });
+    m_decoratee.volumeFade(sound, durationInSeconds, startVolume, endVolume);
+}
+
+void jt::LoggingSoundFadeManager::update(float elapsed) {
+    m_logger.verbose("sound fade manager update", { "jt", "audio", "sound fade" });
+    m_decoratee.update(elapsed); }
+
+size_t jt::LoggingSoundFadeManager::size() const {
+    m_logger.verbose("sound fade manager size", { "jt", "audio", "sound fade" });
+    return m_decoratee.size(); }
diff --git a/impl/jamtemplate/common/audio/fades/logging_sound_fade_manager.hpp b/impl/jamtemplate/common/audio/fades/logging_sound_fade_manager.hpp
new file mode 100644
index 00000000..70178905
--- /dev/null
+++ b/impl/jamtemplate/common/audio/fades/logging_sound_fade_manager.hpp
@@ -0,0 +1,24 @@
+#ifndef JAMTEMPLATE_LOGGING_SOUND_FADE_MANAGER_HPP
+#define JAMTEMPLATE_LOGGING_SOUND_FADE_MANAGER_HPP
+
+#include <audio/fades/sound_fade_manager_interface.hpp>
+#include <log/logger_interface.hpp>
+
+namespace jt {
+
+class LoggingSoundFadeManager : public jt::SoundFadeManagerInterface {
+public:
+    LoggingSoundFadeManager(SoundFadeManagerInterface& decoratee, LoggerInterface& logger);
+    void volumeFade(std::weak_ptr<SoundInterface> sound, float durationInSeconds, float startVolume,
+        float endVolume) override;
+    void update(float elapsed) override;
+    size_t size() const override;
+
+private:
+    SoundFadeManagerInterface& m_decoratee;
+    LoggerInterface& m_logger;
+};
+
+} // namespace jt
+
+#endif // JAMTEMPLATE_LOGGING_SOUND_FADE_MANAGER_HPP
diff --git a/impl/jamtemplate/common/audio/sound_fade_info.cpp b/impl/jamtemplate/common/audio/fades/sound_fade_info.cpp
similarity index 77%
rename from impl/jamtemplate/common/audio/sound_fade_info.cpp
rename to impl/jamtemplate/common/audio/fades/sound_fade_info.cpp
index 18ca3692..266c1b3e 100644
--- a/impl/jamtemplate/common/audio/sound_fade_info.cpp
+++ b/impl/jamtemplate/common/audio/fades/sound_fade_info.cpp
@@ -23,3 +23,12 @@ void jt::SoundFadeInfo::update(float elapsed)
         snd->setVolume(value);
     }
 }
+bool jt::SoundFadeInfo::isAlive() const { return m_age < m_duration; }
+
+bool jt::SoundFadeInfo::hasValidSound() const
+{
+    if (m_sound.expired()) {
+        return false;
+    }
+    return true;
+}
diff --git a/impl/jamtemplate/common/audio/sound_fade_info.hpp b/impl/jamtemplate/common/audio/fades/sound_fade_info.hpp
similarity index 82%
rename from impl/jamtemplate/common/audio/sound_fade_info.hpp
rename to impl/jamtemplate/common/audio/fades/sound_fade_info.hpp
index 70b6298d..c2d32190 100644
--- a/impl/jamtemplate/common/audio/sound_fade_info.hpp
+++ b/impl/jamtemplate/common/audio/fades/sound_fade_info.hpp
@@ -1,20 +1,24 @@
 #ifndef MYAWESOMEGAME_SOUND_FADE_INFO_HPP
 #define MYAWESOMEGAME_SOUND_FADE_INFO_HPP
 
-#include <audio/sound_interface.hpp>
+#include <audio/sound/sound_interface.hpp>
 #include <memory>
 
 namespace jt {
 class SoundFadeManager;
 
 class SoundFadeInfo {
-    friend class SoundFadeManager;
 
+public:
     SoundFadeInfo(std::weak_ptr<jt::SoundInterface> const& sound, float duration, float startVolume,
         float endVolume);
 
     void update(float elapsed);
 
+    bool hasValidSound() const;
+    bool isAlive() const;
+
+private:
     std::weak_ptr<jt::SoundInterface> m_sound;
     float m_startVolume { 0.0f };
     float m_endVolume { 0.0f };
diff --git a/impl/jamtemplate/common/audio/sound_fade_manager.cpp b/impl/jamtemplate/common/audio/fades/sound_fade_manager.cpp
similarity index 71%
rename from impl/jamtemplate/common/audio/sound_fade_manager.cpp
rename to impl/jamtemplate/common/audio/fades/sound_fade_manager.cpp
index 37173f41..02a209b0 100644
--- a/impl/jamtemplate/common/audio/sound_fade_manager.cpp
+++ b/impl/jamtemplate/common/audio/fades/sound_fade_manager.cpp
@@ -12,16 +12,15 @@ void SoundFadeManager::volumeFade(std::weak_ptr<SoundInterface> sound, float dur
 void SoundFadeManager::update(float elapsed)
 {
     m_fadeInfos.erase(std::remove_if(m_fadeInfos.begin(), m_fadeInfos.end(),
-                          [](auto const& fadeInfo) { return fadeInfo.m_sound.expired(); }),
+                          [](auto const& fadeInfo) { return !fadeInfo.hasValidSound(); }),
         m_fadeInfos.end());
 
     for (auto& fade : m_fadeInfos) {
         fade.update(elapsed);
     }
 
-    m_fadeInfos.erase(
-        std::remove_if(m_fadeInfos.begin(), m_fadeInfos.end(),
-            [](auto const& fadeInfo) { return fadeInfo.m_age >= fadeInfo.m_duration; }),
+    m_fadeInfos.erase(std::remove_if(m_fadeInfos.begin(), m_fadeInfos.end(),
+                          [](auto const& fadeInfo) { return !fadeInfo.isAlive(); }),
         m_fadeInfos.end());
 }
 std::size_t SoundFadeManager::size() const { return m_fadeInfos.size(); }
diff --git a/impl/jamtemplate/common/audio/sound_fade_manager.hpp b/impl/jamtemplate/common/audio/fades/sound_fade_manager.hpp
similarity index 58%
rename from impl/jamtemplate/common/audio/sound_fade_manager.hpp
rename to impl/jamtemplate/common/audio/fades/sound_fade_manager.hpp
index 51542572..89bd0c9d 100644
--- a/impl/jamtemplate/common/audio/sound_fade_manager.hpp
+++ b/impl/jamtemplate/common/audio/fades/sound_fade_manager.hpp
@@ -1,23 +1,21 @@
 #ifndef JAMTEMPLATE_FADE_MANAGER_HPP
 #define JAMTEMPLATE_FADE_MANAGER_HPP
 
-#include <audio/sound_fade_info.hpp>
-#include <audio/sound_interface.hpp>
-#include <cstddef>
-#include <memory>
+#include <audio/fades/sound_fade_info.hpp>
+#include <audio/fades/sound_fade_manager_interface.hpp>
 #include <vector>
 
 namespace jt {
 
 // TODO This class should implement an interface.
-class SoundFadeManager {
+class SoundFadeManager : public jt::SoundFadeManagerInterface {
 public:
     void volumeFade(std::weak_ptr<SoundInterface> sound, float durationInSeconds, float startVolume,
-        float endVolume);
+        float endVolume) override;
 
-    void update(float fadeInfo);
+    void update(float elapsed) override;
 
-    std::size_t size() const;
+    std::size_t size() const override;
 
 private:
     std::vector<SoundFadeInfo> m_fadeInfos {};
diff --git a/impl/jamtemplate/common/audio/fades/sound_fade_manager_interface.cpp b/impl/jamtemplate/common/audio/fades/sound_fade_manager_interface.cpp
new file mode 100644
index 00000000..f6246d51
--- /dev/null
+++ b/impl/jamtemplate/common/audio/fades/sound_fade_manager_interface.cpp
@@ -0,0 +1,4 @@
+#include "sound_fade_manager_interface.hpp"
+
+namespace jt {
+} // namespace jt
diff --git a/impl/jamtemplate/common/audio/fades/sound_fade_manager_interface.hpp b/impl/jamtemplate/common/audio/fades/sound_fade_manager_interface.hpp
new file mode 100644
index 00000000..9b5f72d6
--- /dev/null
+++ b/impl/jamtemplate/common/audio/fades/sound_fade_manager_interface.hpp
@@ -0,0 +1,36 @@
+#ifndef JAMTEMPLATE_SOUND_FADE_MANAGER_INTERFACE_HPP
+#define JAMTEMPLATE_SOUND_FADE_MANAGER_INTERFACE_HPP
+
+#include <audio/sound/sound_interface.hpp>
+#include <cstddef>
+#include <memory>
+
+namespace jt {
+
+class SoundFadeManagerInterface {
+public:
+    virtual void volumeFade(std::weak_ptr<SoundInterface> sound, float durationInSeconds,
+        float startVolume, float endVolume)
+        = 0;
+
+    virtual void update(float elapsed) = 0;
+
+    virtual std::size_t size() const = 0;
+
+    /// Destructor
+    virtual ~SoundFadeManagerInterface() = default;
+
+    // no copy, no move. Avoid slicing.
+    SoundFadeManagerInterface(const SoundFadeManagerInterface&) = delete;
+    SoundFadeManagerInterface(SoundFadeManagerInterface&&) = delete;
+    SoundFadeManagerInterface& operator=(const SoundFadeManagerInterface&) = delete;
+    SoundFadeManagerInterface& operator=(SoundFadeManagerInterface&&) = delete;
+
+protected:
+    // default default constructor can only be called from derived classes
+    SoundFadeManagerInterface() = default;
+};
+
+} // namespace jt
+
+#endif // JAMTEMPLATE_SOUND_FADE_MANAGER_INTERFACE_HPP
diff --git a/impl/jamtemplate/common/audio/intro_looping_sound_with_effect.cpp b/impl/jamtemplate/common/audio/sound/intro_looping_sound_with_effect.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/intro_looping_sound_with_effect.cpp
rename to impl/jamtemplate/common/audio/sound/intro_looping_sound_with_effect.cpp
diff --git a/impl/jamtemplate/common/audio/intro_looping_sound_with_effect.hpp b/impl/jamtemplate/common/audio/sound/intro_looping_sound_with_effect.hpp
similarity index 94%
rename from impl/jamtemplate/common/audio/intro_looping_sound_with_effect.hpp
rename to impl/jamtemplate/common/audio/sound/intro_looping_sound_with_effect.hpp
index 90c3e042..3a8c73c8 100644
--- a/impl/jamtemplate/common/audio/intro_looping_sound_with_effect.hpp
+++ b/impl/jamtemplate/common/audio/sound/intro_looping_sound_with_effect.hpp
@@ -1,8 +1,8 @@
 #ifndef GUARD_JAMTEMPLATE_INTRO_LOOPING_SOUND_WITH_EFFECT_HPP
 #define GUARD_JAMTEMPLATE_INTRO_LOOPING_SOUND_WITH_EFFECT_HPP
 
-#include <audio/sound_base.hpp>
-#include <audio/sound_with_effect.hpp>
+#include <audio/sound/sound_base.hpp>
+#include <audio/sound/sound_with_effect.hpp>
 #include <oalpp/effects/mono_effect_interface.hpp>
 #include <oalpp/sound.hpp>
 #include <oalpp/sound_data/sound_data.hpp>
diff --git a/impl/jamtemplate/common/audio/logging_sound.cpp b/impl/jamtemplate/common/audio/sound/logging_sound.cpp
similarity index 99%
rename from impl/jamtemplate/common/audio/logging_sound.cpp
rename to impl/jamtemplate/common/audio/sound/logging_sound.cpp
index 2ff57f8b..f1955576 100644
--- a/impl/jamtemplate/common/audio/logging_sound.cpp
+++ b/impl/jamtemplate/common/audio/sound/logging_sound.cpp
@@ -1,5 +1,5 @@
 #include "logging_sound.hpp"
-#include <audio/sound.hpp>
+#include <audio/sound/sound.hpp>
 
 jt::LoggingSound::LoggingSound(
     std::shared_ptr<jt::SoundInterface> decoratee, jt::LoggerInterface& logger)
diff --git a/impl/jamtemplate/common/audio/logging_sound.hpp b/impl/jamtemplate/common/audio/sound/logging_sound.hpp
similarity index 96%
rename from impl/jamtemplate/common/audio/logging_sound.hpp
rename to impl/jamtemplate/common/audio/sound/logging_sound.hpp
index 49baa772..ecdd05b9 100644
--- a/impl/jamtemplate/common/audio/logging_sound.hpp
+++ b/impl/jamtemplate/common/audio/sound/logging_sound.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_LOGGING_SOUND_HPP
 #define JAMTEMPLATE_LOGGING_SOUND_HPP
 
-#include <audio/sound_interface.hpp>
+#include <audio/sound/sound_interface.hpp>
 #include <log/logger_interface.hpp>
 
 namespace jt {
diff --git a/impl/jamtemplate/common/audio/sound.cpp b/impl/jamtemplate/common/audio/sound/sound.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/sound.cpp
rename to impl/jamtemplate/common/audio/sound/sound.cpp
diff --git a/impl/jamtemplate/common/audio/sound.hpp b/impl/jamtemplate/common/audio/sound/sound.hpp
similarity index 95%
rename from impl/jamtemplate/common/audio/sound.hpp
rename to impl/jamtemplate/common/audio/sound/sound.hpp
index 1581169a..9b3a670d 100644
--- a/impl/jamtemplate/common/audio/sound.hpp
+++ b/impl/jamtemplate/common/audio/sound/sound.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_SOUND_HPP
 #define JAMTEMPLATE_SOUND_HPP
 
-#include <audio/sound_base.hpp>
+#include <audio/sound/sound_base.hpp>
 #include <counted_object.hpp>
 #include <oalpp/sound.hpp>
 #include <oalpp/sound_data.hpp>
diff --git a/impl/jamtemplate/common/audio/sound_base.cpp b/impl/jamtemplate/common/audio/sound/sound_base.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/sound_base.cpp
rename to impl/jamtemplate/common/audio/sound/sound_base.cpp
diff --git a/impl/jamtemplate/common/audio/sound_base.hpp b/impl/jamtemplate/common/audio/sound/sound_base.hpp
similarity index 94%
rename from impl/jamtemplate/common/audio/sound_base.hpp
rename to impl/jamtemplate/common/audio/sound/sound_base.hpp
index b8a03306..d31b5731 100644
--- a/impl/jamtemplate/common/audio/sound_base.hpp
+++ b/impl/jamtemplate/common/audio/sound/sound_base.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_SOUND_BASE_HPP
 #define JAMTEMPLATE_SOUND_BASE_HPP
 
-#include <audio/sound_interface.hpp>
+#include <audio/sound/sound_interface.hpp>
 
 namespace jt {
 
diff --git a/impl/jamtemplate/common/audio/sound_group.cpp b/impl/jamtemplate/common/audio/sound/sound_group.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/sound_group.cpp
rename to impl/jamtemplate/common/audio/sound/sound_group.cpp
diff --git a/impl/jamtemplate/common/audio/sound_group.hpp b/impl/jamtemplate/common/audio/sound/sound_group.hpp
similarity index 97%
rename from impl/jamtemplate/common/audio/sound_group.hpp
rename to impl/jamtemplate/common/audio/sound/sound_group.hpp
index b7ce4d57..43f82b96 100644
--- a/impl/jamtemplate/common/audio/sound_group.hpp
+++ b/impl/jamtemplate/common/audio/sound/sound_group.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_SOUNDGROUP_HPP
 #define JAMTEMPLATE_SOUNDGROUP_HPP
 
-#include <audio/sound_interface.hpp>
+#include <audio/sound/sound_interface.hpp>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/impl/jamtemplate/common/audio/sound_interface.cpp b/impl/jamtemplate/common/audio/sound/sound_interface.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/sound_interface.cpp
rename to impl/jamtemplate/common/audio/sound/sound_interface.cpp
diff --git a/impl/jamtemplate/common/audio/sound_interface.hpp b/impl/jamtemplate/common/audio/sound/sound_interface.hpp
similarity index 97%
rename from impl/jamtemplate/common/audio/sound_interface.hpp
rename to impl/jamtemplate/common/audio/sound/sound_interface.hpp
index 93eea4b5..9b7d0fa4 100644
--- a/impl/jamtemplate/common/audio/sound_interface.hpp
+++ b/impl/jamtemplate/common/audio/sound/sound_interface.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_SOUNDINTERFACE_HPP
 #define JAMTEMPLATE_SOUNDINTERFACE_HPP
 
-#include <audio/group_volume_getter_interface.hpp>
+#include <audio/sound_groups/group_volume_getter_interface.hpp>
 
 namespace jt {
 
diff --git a/impl/jamtemplate/common/audio/sound_null.cpp b/impl/jamtemplate/common/audio/sound/sound_null.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/sound_null.cpp
rename to impl/jamtemplate/common/audio/sound/sound_null.cpp
diff --git a/impl/jamtemplate/common/audio/sound_null.hpp b/impl/jamtemplate/common/audio/sound/sound_null.hpp
similarity index 95%
rename from impl/jamtemplate/common/audio/sound_null.hpp
rename to impl/jamtemplate/common/audio/sound/sound_null.hpp
index 271483ea..07c810df 100644
--- a/impl/jamtemplate/common/audio/sound_null.hpp
+++ b/impl/jamtemplate/common/audio/sound/sound_null.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_SOUND_NULL_HPP
 #define JAMTEMPLATE_SOUND_NULL_HPP
 
-#include <audio/sound_interface.hpp>
+#include <audio/sound/sound_interface.hpp>
 
 namespace jt {
 
diff --git a/impl/jamtemplate/common/audio/sound_with_effect.cpp b/impl/jamtemplate/common/audio/sound/sound_with_effect.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/sound_with_effect.cpp
rename to impl/jamtemplate/common/audio/sound/sound_with_effect.cpp
diff --git a/impl/jamtemplate/common/audio/sound_with_effect.hpp b/impl/jamtemplate/common/audio/sound/sound_with_effect.hpp
similarity index 96%
rename from impl/jamtemplate/common/audio/sound_with_effect.hpp
rename to impl/jamtemplate/common/audio/sound/sound_with_effect.hpp
index 3f73b3bf..86b69cc4 100644
--- a/impl/jamtemplate/common/audio/sound_with_effect.hpp
+++ b/impl/jamtemplate/common/audio/sound/sound_with_effect.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_SOUND_WITH_EFFECT_HPP
 #define JAMTEMPLATE_SOUND_WITH_EFFECT_HPP
 
-#include <audio/sound_base.hpp>
+#include "sound_base.hpp"
 #include <oalpp/sound.hpp>
 #include <oalpp/sound_data.hpp>
 
diff --git a/impl/jamtemplate/common/audio/group_volume_getter_interface.cpp b/impl/jamtemplate/common/audio/sound_groups/group_volume_getter_interface.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/group_volume_getter_interface.cpp
rename to impl/jamtemplate/common/audio/sound_groups/group_volume_getter_interface.cpp
diff --git a/impl/jamtemplate/common/audio/group_volume_getter_interface.hpp b/impl/jamtemplate/common/audio/sound_groups/group_volume_getter_interface.hpp
similarity index 100%
rename from impl/jamtemplate/common/audio/group_volume_getter_interface.hpp
rename to impl/jamtemplate/common/audio/sound_groups/group_volume_getter_interface.hpp
diff --git a/impl/jamtemplate/common/audio/group_volume_manager.cpp b/impl/jamtemplate/common/audio/sound_groups/group_volume_manager.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/group_volume_manager.cpp
rename to impl/jamtemplate/common/audio/sound_groups/group_volume_manager.cpp
diff --git a/impl/jamtemplate/common/audio/group_volume_manager.hpp b/impl/jamtemplate/common/audio/sound_groups/group_volume_manager.hpp
similarity index 82%
rename from impl/jamtemplate/common/audio/group_volume_manager.hpp
rename to impl/jamtemplate/common/audio/sound_groups/group_volume_manager.hpp
index 3409b4fc..b1c0b723 100644
--- a/impl/jamtemplate/common/audio/group_volume_manager.hpp
+++ b/impl/jamtemplate/common/audio/sound_groups/group_volume_manager.hpp
@@ -1,8 +1,8 @@
 #ifndef JAMTEMPLATE_GROUP_VOLUME_MANAGER_HPP
 #define JAMTEMPLATE_GROUP_VOLUME_MANAGER_HPP
 
-#include <audio/group_volume_getter_interface.hpp>
-#include <audio/group_volume_setter_interface.hpp>
+#include <audio/sound_groups/group_volume_getter_interface.hpp>
+#include <audio/sound_groups/group_volume_setter_interface.hpp>
 #include <map>
 
 namespace jt {
diff --git a/impl/jamtemplate/common/audio/group_volume_setter_interface.cpp b/impl/jamtemplate/common/audio/sound_groups/group_volume_setter_interface.cpp
similarity index 100%
rename from impl/jamtemplate/common/audio/group_volume_setter_interface.cpp
rename to impl/jamtemplate/common/audio/sound_groups/group_volume_setter_interface.cpp
diff --git a/impl/jamtemplate/common/audio/group_volume_setter_interface.hpp b/impl/jamtemplate/common/audio/sound_groups/group_volume_setter_interface.hpp
similarity index 100%
rename from impl/jamtemplate/common/audio/group_volume_setter_interface.hpp
rename to impl/jamtemplate/common/audio/sound_groups/group_volume_setter_interface.hpp
diff --git a/impl/jamtemplate/common/game_interface.hpp b/impl/jamtemplate/common/game_interface.hpp
index ec2eb2df..661a969e 100644
--- a/impl/jamtemplate/common/game_interface.hpp
+++ b/impl/jamtemplate/common/game_interface.hpp
@@ -2,7 +2,7 @@
 #define JAMTEMPLATE_GAMEINTERFACE_HPP
 
 #include <action_commands/action_command_manager_interface.hpp>
-#include <audio/audio_interface.hpp>
+#include <audio/audio/audio_interface.hpp>
 #include <cache_interface.hpp>
 #include <cam_interface.hpp>
 #include <graphics/gfx_interface.hpp>
diff --git a/test/integration/demo/audio/state_audio.cpp b/test/integration/demo/audio/state_audio.cpp
index 4832f7e1..c14b2273 100644
--- a/test/integration/demo/audio/state_audio.cpp
+++ b/test/integration/demo/audio/state_audio.cpp
@@ -1,5 +1,5 @@
 #include "state_audio.hpp"
-#include <audio/sound_group.hpp>
+#include <audio/sound/sound_group.hpp>
 #include <game_interface.hpp>
 #include <state_select.hpp>
 #include <imgui.h>
diff --git a/test/integration/demo/audio/state_audio.hpp b/test/integration/demo/audio/state_audio.hpp
index 2a4dd31d..de6f72b0 100644
--- a/test/integration/demo/audio/state_audio.hpp
+++ b/test/integration/demo/audio/state_audio.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_STATE_AUDIO_HPP
 #define JAMTEMPLATE_STATE_AUDIO_HPP
 
-#include <audio/sound_with_effect.hpp>
+#include <audio/sound/sound_with_effect.hpp>
 #include <game_state.hpp>
 #include <oalpp/effects/filter/butterworth_24db_lowpass.hpp>
 #include <map>
diff --git a/test/integration/demo/imgui/state_imgui.cpp b/test/integration/demo/imgui/state_imgui.cpp
index dd4fb28d..8f7b90c3 100644
--- a/test/integration/demo/imgui/state_imgui.cpp
+++ b/test/integration/demo/imgui/state_imgui.cpp
@@ -27,7 +27,7 @@ void StateImGui::onDraw() const
     ImGui::ShowDemoWindow();
 
     ImGui::Begin("arbitrary precision integers");
-    ImGui::Text("%s", m_api.to_string().c_str());
+    ImGui::Text("%s", m_api.to_exp_string().c_str());
 
     ImGui::SliderInt("Value", &number, 0, 999999);
     if (ImGui::Button("add")) {
diff --git a/test/integration/demo/inventory/state_inventory.hpp b/test/integration/demo/inventory/state_inventory.hpp
index 81b1d2ba..fa652296 100644
--- a/test/integration/demo/inventory/state_inventory.hpp
+++ b/test/integration/demo/inventory/state_inventory.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_STATE_INVENTORY_HPP
 #define JAMTEMPLATE_STATE_INVENTORY_HPP
 
-#include <audio/sound.hpp>
+#include <audio/sound/sound.hpp>
 #include <game_state.hpp>
 #include <inventory/character/character.hpp>
 #include <inventory/character_sheet_imgui.hpp>
diff --git a/test/integration/demo/main.cpp b/test/integration/demo/main.cpp
index cc818fb4..9470819e 100644
--- a/test/integration/demo/main.cpp
+++ b/test/integration/demo/main.cpp
@@ -1,7 +1,9 @@
 #include <action_commands/action_command_manager.hpp>
 #include <action_commands/basic_action_commands.hpp>
-#include <audio/audio_impl.hpp>
-#include <audio/logging_audio.hpp>
+#include <audio/audio/audio_impl.hpp>
+#include <audio/audio/logging_audio.hpp>
+#include <audio/fades/logging_sound_fade_manager.hpp>
+#include <audio/fades/sound_fade_manager.hpp>
 #include <cache_impl.hpp>
 #include <camera.hpp>
 #include <game.hpp>
@@ -52,7 +54,8 @@ int main()
     jt::LoggingCamera loggingCamera { camera, logger };
     jt::GfxImpl gfx { loggingRenderWindow, loggingCamera };
 
-    jt::AudioImpl audio;
+    jt::SoundFadeManager fades;
+    jt::AudioImpl audio { std::make_unique<jt::LoggingSoundFadeManager>(fades, logger) };
     jt::LoggingAudio loggingAudio { audio, logger };
 
     jt::StateManager stateManager { std::make_shared<StateSelect>() };
diff --git a/test/integration/performance/startgame.cpp b/test/integration/performance/startgame.cpp
index 89d8fd6b..de7b49ca 100644
--- a/test/integration/performance/startgame.cpp
+++ b/test/integration/performance/startgame.cpp
@@ -1,5 +1,5 @@
 #include <action_commands/action_command_manager.hpp>
-#include <audio/audio_null.hpp>
+#include <audio/audio/audio_null.hpp>
 #include <cache_null.hpp>
 #include <camera.hpp>
 #include <game.hpp>
diff --git a/test/integration/performance/tweens.cpp b/test/integration/performance/tweens.cpp
index 5de73bed..6767ac2a 100644
--- a/test/integration/performance/tweens.cpp
+++ b/test/integration/performance/tweens.cpp
@@ -1,5 +1,5 @@
 #include <action_commands/action_command_manager.hpp>
-#include <audio/audio_null.hpp>
+#include <audio/audio/audio_null.hpp>
 #include <cache_null.hpp>
 #include <camera.hpp>
 #include <game.hpp>
diff --git a/test/unit/jt_test/CMakeLists.txt b/test/unit/jt_test/CMakeLists.txt
index 31e94e15..a648359b 100644
--- a/test/unit/jt_test/CMakeLists.txt
+++ b/test/unit/jt_test/CMakeLists.txt
@@ -3,7 +3,7 @@ file(GLOB UNITTESTFILES_BASE CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*)
 file(GLOB_RECURSE UNITTESTFILES_SFML CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sfml/*)
 file(GLOB_RECURSE UNITTESTFILES_SDL CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sdl/*)
 
-set(UNITTESTFILES_ALL ${UNITTESTFILES_COMMON})
+set(UNITTESTFILES_ALL ${UNITTESTFILES_COMMON} common/audio/sound_fade_info_test.cpp)
 
 if (USE_SFML)
     list(APPEND UNITTESTFILES_ALL ${UNITTESTFILES_SFML})
diff --git a/test/unit/jt_test/common/audio/audio_null_test.cpp b/test/unit/jt_test/common/audio/audio_null_test.cpp
index da6529ae..e030b30b 100644
--- a/test/unit/jt_test/common/audio/audio_null_test.cpp
+++ b/test/unit/jt_test/common/audio/audio_null_test.cpp
@@ -1,4 +1,4 @@
-#include <audio/audio_null.hpp>
+#include <audio/audio/audio_null.hpp>
 #include <gtest/gtest.h>
 
 TEST(AudioNullTest, GetPermanentSoundReturnsNoNullptr)
diff --git a/test/unit/jt_test/common/audio/group_volume_manager_test.cpp b/test/unit/jt_test/common/audio/group_volume_manager_test.cpp
index 17cf5611..f9f93971 100644
--- a/test/unit/jt_test/common/audio/group_volume_manager_test.cpp
+++ b/test/unit/jt_test/common/audio/group_volume_manager_test.cpp
@@ -1,4 +1,4 @@
-#include <audio/group_volume_manager.hpp>
+#include <audio/sound_groups/group_volume_manager.hpp>
 #include <gtest/gtest.h>
 
 TEST(GroupVolumeManagerTest, InitialVolumeIsOne)
diff --git a/test/unit/jt_test/common/audio/sound_fade_info_test.cpp b/test/unit/jt_test/common/audio/sound_fade_info_test.cpp
new file mode 100644
index 00000000..5309dd30
--- /dev/null
+++ b/test/unit/jt_test/common/audio/sound_fade_info_test.cpp
@@ -0,0 +1,48 @@
+#include <audio/fades/sound_fade_info.hpp>
+#include <mocks/mock_sound.hpp>
+#include <gtest/gtest.h>
+
+TEST(SoundFadeInfoTest, isAliveReturnsTrueInitially)
+{
+    std::shared_ptr<MockSound> sound = std::make_shared<MockSound>();
+    jt::SoundFadeInfo fi { sound, 0.5f, 1.0f, 0.0f };
+    ASSERT_TRUE(fi.isAlive());
+}
+TEST(SoundFadeInfoTest, isAliveReturnsTrueAfterUpdateShorterThanFade)
+{
+    std::shared_ptr<MockSound> sound = std::make_shared<MockSound>();
+    jt::SoundFadeInfo fi { sound, 0.5f, 1.0f, 0.0f };
+    fi.update(0.2f);
+    ASSERT_TRUE(fi.isAlive());
+}
+
+TEST(SoundFadeInfoTest, isAliveReturnsFalseAfterUpdateLongerThanFade)
+{
+    std::shared_ptr<MockSound> sound = std::make_shared<MockSound>();
+    jt::SoundFadeInfo fi { sound, 0.5f, 1.0f, 0.0f };
+    fi.update(5.0f);
+    ASSERT_FALSE(fi.isAlive());
+}
+
+TEST(SoundFadeInfoTest, hasValidSoundReturnsTrueForValidSound)
+{
+    std::shared_ptr<MockSound> sound = std::make_shared<MockSound>();
+    jt::SoundFadeInfo fi { sound, 0.5f, 1.0f, 0.0f };
+    ASSERT_TRUE(fi.hasValidSound());
+}
+
+TEST(SoundFadeInfoTest, hasValidSoundReturnsFalseForDeletedSound)
+{
+    std::shared_ptr<MockSound> sound = std::make_shared<MockSound>();
+    jt::SoundFadeInfo fi { sound, 0.5f, 1.0f, 0.0f };
+    sound.reset();
+    ASSERT_FALSE(fi.hasValidSound());
+}
+
+TEST(SoundFadeInfoTest, UpdateWithoutValidSoundDoesNotThrow)
+{
+    std::shared_ptr<MockSound> sound = std::make_shared<MockSound>();
+    jt::SoundFadeInfo fi { sound, 0.5f, 1.0f, 0.0f };
+    sound.reset();
+    ASSERT_NO_THROW(fi.update(0.5f));
+}
diff --git a/test/unit/jt_test/common/audio/sound_fade_manager_test.cpp b/test/unit/jt_test/common/audio/sound_fade_manager_test.cpp
index 26a24075..5c4e67b1 100644
--- a/test/unit/jt_test/common/audio/sound_fade_manager_test.cpp
+++ b/test/unit/jt_test/common/audio/sound_fade_manager_test.cpp
@@ -1,4 +1,4 @@
-#include <audio/sound_fade_manager.hpp>
+#include <audio/fades/sound_fade_manager.hpp>
 #include <mocks/mock_sound.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/jt_test/common/audio/sound_group_test.cpp b/test/unit/jt_test/common/audio/sound_group_test.cpp
index f2987914..e23c6f8e 100644
--- a/test/unit/jt_test/common/audio/sound_group_test.cpp
+++ b/test/unit/jt_test/common/audio/sound_group_test.cpp
@@ -1,5 +1,5 @@
-#include <audio/sound_group.hpp>
-#include <audio/sound_null.hpp>
+#include <audio/sound/sound_group.hpp>
+#include <audio/sound/sound_null.hpp>
 #include <gtest/gtest.h>
 
 TEST(SoundGroupTest, EmptySoundGroupContainsNoSound)
diff --git a/test/unit/jt_test/common/audio/sound_null_test.cpp b/test/unit/jt_test/common/audio/sound_null_test.cpp
index fc265ccf..edabab76 100644
--- a/test/unit/jt_test/common/audio/sound_null_test.cpp
+++ b/test/unit/jt_test/common/audio/sound_null_test.cpp
@@ -1,4 +1,4 @@
-#include <audio/sound_null.hpp>
+#include <audio/sound/sound_null.hpp>
 #include <gtest/gtest.h>
 
 TEST(SoundNullTest, UpdateDoesNotThrowException)
diff --git a/test/unit/jt_test/common/audio/sound_test.cpp b/test/unit/jt_test/common/audio/sound_test.cpp
index 655ce22e..ab70fdb0 100644
--- a/test/unit/jt_test/common/audio/sound_test.cpp
+++ b/test/unit/jt_test/common/audio/sound_test.cpp
@@ -1,4 +1,4 @@
-#include <audio/sound.hpp>
+#include <audio/sound/sound.hpp>
 #include <oalpp/sound_context.hpp>
 #include <gtest/gtest.h>
 #include <memory>
diff --git a/test/unit/jt_test/common/game_test.hpp b/test/unit/jt_test/common/game_test.hpp
index 872faee8..5868219a 100644
--- a/test/unit/jt_test/common/game_test.hpp
+++ b/test/unit/jt_test/common/game_test.hpp
@@ -2,7 +2,7 @@
 #define JAMTEMPLATE_UNITTESTS_GAME_TEST_HPP
 
 #include <action_commands/action_command_manager.hpp>
-#include <audio/audio_null.hpp>
+#include <audio/audio/audio_null.hpp>
 #include <cache_null.hpp>
 #include <game.hpp>
 #include <mocks/mock_camera.hpp>
diff --git a/test/unit/jt_test/mocks/mock_sound.hpp b/test/unit/jt_test/mocks/mock_sound.hpp
index 92d65b5a..e13e72b4 100644
--- a/test/unit/jt_test/mocks/mock_sound.hpp
+++ b/test/unit/jt_test/mocks/mock_sound.hpp
@@ -1,7 +1,7 @@
 #ifndef JAMTEMPLATE_MOCK_SOUND_HPP
 #define JAMTEMPLATE_MOCK_SOUND_HPP
 
-#include <audio/sound_interface.hpp>
+#include <audio/sound/sound_interface.hpp>
 #include <gmock/gmock.h>
 
 class MockSound : public jt::SoundInterface {
@@ -23,7 +23,7 @@ class MockSound : public jt::SoundInterface {
     MOCK_METHOD(float, getBlend, (), (const, override));
     MOCK_METHOD(int, getSampleRate, (), (const, override));
     MOCK_METHOD(void, setVolumeProvider, (jt::GroupVolumeGetterInterface&), (override));
-    MOCK_METHOD(void, setVolumeGroup,(std::string const&), (override));
+    MOCK_METHOD(void, setVolumeGroup, (std::string const&), (override));
 };
 
 #endif // JAMTEMPLATE_MOCK_SOUND_HPP