diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt
index 21c1de1f8..efeb15fee 100644
--- a/code/nel/src/sound/CMakeLists.txt
+++ b/code/nel/src/sound/CMakeLists.txt
@@ -1,8 +1,92 @@
+
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../../include/nel/sound/*.h)
 
+
+FILE(GLOB ANIMATION
+	sound_anim_manager.cpp ../../include/nel/sound/sound_anim_manager.h
+	sound_anim_marker.cpp ../../include/nel/sound/sound_anim_marker.h
+	sound_animation.cpp ../../include/nel/sound/sound_animation.h
+)
+
+FILE(GLOB BACKGROUND_SOUND
+	background_sound.cpp ../../include/nel/sound/background_sound.h
+	background_sound_manager.cpp ../../include/nel/sound/background_sound_manager.h
+	background_source.cpp ../../include/nel/sound/background_source.h
+	clustered_sound.cpp ../../include/nel/sound/clustered_sound.h
+	context_sound.cpp ../../include/nel/sound/context_sound.h
+)
+
+FILE(GLOB BANKS
+	async_file_manager_sound.cpp ../../include/nel/sound/async_file_manager_sound.h
+	sample_bank.cpp ../../include/nel/sound/sample_bank.h
+	sample_bank_manager.cpp ../../include/nel/sound/sample_bank_manager.h
+	sound_bank.cpp ../../include/nel/sound/sound_bank.h
+)
+
+FILE(GLOB MIXER
+	audio_mixer_user.cpp ../../include/nel/sound/audio_mixer_user.h
+	../../include/nel/sound/containers.h
+	group_controller.cpp ../../include/nel/sound/group_controller.h
+	group_controller_root.cpp ../../include/nel/sound/group_controller_root.h
+	listener_user.cpp ../../include/nel/sound/listener_user.h
+	mixing_track.cpp ../../include/nel/sound/mixing_track.h
+)
+
+FILE(GLOB MUSIC
+	music_channel_fader.cpp ../../include/nel/sound/music_channel_fader.h
+	music_sound.cpp ../../include/nel/sound/music_sound.h
+	music_sound_manager.cpp ../../include/nel/sound/music_sound_manager.h
+	music_source.cpp ../../include/nel/sound/music_source.h
+)
+
+FILE(GLOB SOUND
+	complex_sound.cpp ../../include/nel/sound/complex_sound.h
+	complex_source.cpp ../../include/nel/sound/complex_source.h
+	simple_sound.cpp ../../include/nel/sound/simple_sound.h
+	simple_source.cpp ../../include/nel/sound/simple_source.h
+	sound.cpp ../../include/nel/sound/sound.h
+	../../include/nel/sound/sound_pattern.h
+	source_common.cpp ../../include/nel/sound/source_common.h
+)
+
+FILE(GLOB STREAM
+	stream_sound.cpp ../../include/nel/sound/stream_sound.h
+	stream_source.cpp ../../include/nel/sound/stream_source.h
+)
+
+FILE(GLOB USER_CLASSES
+	../../include/nel/sound/u_audio_mixer.h
+	../../include/nel/sound/u_group_controller.h
+	../../include/nel/sound/u_listener.h
+	../../include/nel/sound/u_source.h
+	../../include/nel/sound/u_stream_source.h
+)
+
+SOURCE_GROUP("" FILES ${SRC} ${HEADERS})
+SOURCE_GROUP("animation" FILES ${ANIMATION})
+SOURCE_GROUP("background_sound" FILES ${BACKGROUND_SOUND})
+SOURCE_GROUP("banks" FILES ${BANKS})
+SOURCE_GROUP("mixer" FILES ${MIXER})
+SOURCE_GROUP("music_deprecated" FILES ${MUSIC})
+SOURCE_GROUP("sound" FILES ${SOUND})
+SOURCE_GROUP("stream" FILES ${STREAM})
+SOURCE_GROUP("user_classes" FILES ${USER_CLASSES})
+
+
 NL_TARGET_LIB(nelsound ${HEADERS} ${SRC})
 
+
+INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(nelsound ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
+
+IF(WITH_STATIC)
+  # Add libogg dependency only if target is static because to libvorbisfile
+  TARGET_LINK_LIBRARIES(nelsound ${OGG_LIBRARY})
+ENDIF(WITH_STATIC)
+
+
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel)
diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/code/nel/src/sound/driver/CMakeLists.txt
index 1a8391c41..d1d82169c 100644
--- a/code/nel/src/sound/driver/CMakeLists.txt
+++ b/code/nel/src/sound/driver/CMakeLists.txt
@@ -3,15 +3,6 @@ FILE(GLOB HEADERS ../../../include/nel/sound/driver/*.h)
 
 NL_TARGET_LIB(nelsnd_lowlevel ${HEADERS} ${SRC})
 
-INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
-
-TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
-
-IF(WITH_STATIC)
-  # Add libogg dependency only if target is static because to libvorbisfile
-  TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${OGG_LIBRARY})
-ENDIF(WITH_STATIC)
-
 SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
 NL_ADD_RUNTIME_FLAGS(nelsnd_lowlevel)