diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af52e5e88a4f0a896c24da2dd508d4d42bfcbc22..9df5ed777405dc42c177ed9f3b54f42fefdadc44 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,10 +62,10 @@ option (WITH_STATIC_LIB "Link Nootka libraries statically - used for AppImage" O
 
 qt_add_executable(nootka WIN32)
 
-add_subdirectory( core )     # libNootkaCore
-add_subdirectory( libs/sound )    # libNootkaSound
+add_subdirectory( core )
+add_subdirectory( sound )
 
-include_directories( core libs/sound ) # libs/main
+include_directories( core sound )
 
 # nootka executable
 set(NOOTKA_SRC
diff --git a/src/libs/sound/sounds b/src/libs/sound/sounds
deleted file mode 120000
index 94ca66fe0e99d18b3d506e15637071d2b32a2c00..0000000000000000000000000000000000000000
--- a/src/libs/sound/sounds
+++ /dev/null
@@ -1 +0,0 @@
-../../../sounds
\ No newline at end of file
diff --git a/src/libs/sound/CMakeLists.txt b/src/sound/CMakeLists.txt
similarity index 100%
rename from src/libs/sound/CMakeLists.txt
rename to src/sound/CMakeLists.txt
diff --git a/src/libs/sound/fftw b/src/sound/fftw
similarity index 100%
rename from src/libs/sound/fftw
rename to src/sound/fftw
diff --git a/src/libs/sound/nootkasoundglobal.h b/src/sound/nootkasoundglobal.h
similarity index 100%
rename from src/libs/sound/nootkasoundglobal.h
rename to src/sound/nootkasoundglobal.h
diff --git a/src/libs/sound/ogg b/src/sound/ogg
similarity index 100%
rename from src/libs/sound/ogg
rename to src/sound/ogg
diff --git a/src/libs/sound/rt/CMakeLists.txt b/src/sound/rt/CMakeLists.txt
similarity index 100%
rename from src/libs/sound/rt/CMakeLists.txt
rename to src/sound/rt/CMakeLists.txt
diff --git a/src/libs/sound/rt/FunctionDiscoveryKeys_devpkey.h b/src/sound/rt/FunctionDiscoveryKeys_devpkey.h
similarity index 100%
rename from src/libs/sound/rt/FunctionDiscoveryKeys_devpkey.h
rename to src/sound/rt/FunctionDiscoveryKeys_devpkey.h
diff --git a/src/libs/sound/rt/RtAudio.cpp b/src/sound/rt/RtAudio.cpp
similarity index 100%
rename from src/libs/sound/rt/RtAudio.cpp
rename to src/sound/rt/RtAudio.cpp
diff --git a/src/libs/sound/rt/RtAudio.h b/src/sound/rt/RtAudio.h
similarity index 100%
rename from src/libs/sound/rt/RtAudio.h
rename to src/sound/rt/RtAudio.h
diff --git a/src/libs/sound/rt/RtMidi-license b/src/sound/rt/RtMidi-license
similarity index 100%
rename from src/libs/sound/rt/RtMidi-license
rename to src/sound/rt/RtMidi-license
diff --git a/src/libs/sound/rt/RtMidi.cpp b/src/sound/rt/RtMidi.cpp
similarity index 100%
rename from src/libs/sound/rt/RtMidi.cpp
rename to src/sound/rt/RtMidi.cpp
diff --git a/src/libs/sound/rt/RtMidi.h b/src/sound/rt/RtMidi.h
similarity index 100%
rename from src/libs/sound/rt/RtMidi.h
rename to src/sound/rt/RtMidi.h
diff --git a/src/libs/sound/rt/asio.cpp b/src/sound/rt/asio.cpp
similarity index 100%
rename from src/libs/sound/rt/asio.cpp
rename to src/sound/rt/asio.cpp
diff --git a/src/libs/sound/rt/asio.h b/src/sound/rt/asio.h
similarity index 100%
rename from src/libs/sound/rt/asio.h
rename to src/sound/rt/asio.h
diff --git a/src/libs/sound/rt/asiodrivers.cpp b/src/sound/rt/asiodrivers.cpp
similarity index 100%
rename from src/libs/sound/rt/asiodrivers.cpp
rename to src/sound/rt/asiodrivers.cpp
diff --git a/src/libs/sound/rt/asiodrivers.h b/src/sound/rt/asiodrivers.h
similarity index 100%
rename from src/libs/sound/rt/asiodrivers.h
rename to src/sound/rt/asiodrivers.h
diff --git a/src/libs/sound/rt/asiodrvr.h b/src/sound/rt/asiodrvr.h
similarity index 100%
rename from src/libs/sound/rt/asiodrvr.h
rename to src/sound/rt/asiodrvr.h
diff --git a/src/libs/sound/rt/asiolist.cpp b/src/sound/rt/asiolist.cpp
similarity index 100%
rename from src/libs/sound/rt/asiolist.cpp
rename to src/sound/rt/asiolist.cpp
diff --git a/src/libs/sound/rt/asiolist.h b/src/sound/rt/asiolist.h
similarity index 100%
rename from src/libs/sound/rt/asiolist.h
rename to src/sound/rt/asiolist.h
diff --git a/src/libs/sound/rt/asiosys.h b/src/sound/rt/asiosys.h
similarity index 100%
rename from src/libs/sound/rt/asiosys.h
rename to src/sound/rt/asiosys.h
diff --git a/src/libs/sound/rt/dsound.h b/src/sound/rt/dsound.h
similarity index 100%
rename from src/libs/sound/rt/dsound.h
rename to src/sound/rt/dsound.h
diff --git a/src/libs/sound/rt/ginclude.h b/src/sound/rt/ginclude.h
similarity index 100%
rename from src/libs/sound/rt/ginclude.h
rename to src/sound/rt/ginclude.h
diff --git a/src/libs/sound/rt/iasiodrv.h b/src/sound/rt/iasiodrv.h
similarity index 100%
rename from src/libs/sound/rt/iasiodrv.h
rename to src/sound/rt/iasiodrv.h
diff --git a/src/libs/sound/rt/iasiothiscallresolver.cpp b/src/sound/rt/iasiothiscallresolver.cpp
similarity index 100%
rename from src/libs/sound/rt/iasiothiscallresolver.cpp
rename to src/sound/rt/iasiothiscallresolver.cpp
diff --git a/src/libs/sound/rt/iasiothiscallresolver.h b/src/sound/rt/iasiothiscallresolver.h
similarity index 100%
rename from src/libs/sound/rt/iasiothiscallresolver.h
rename to src/sound/rt/iasiothiscallresolver.h
diff --git a/src/libs/sound/rt/midi_instruments_list.txt b/src/sound/rt/midi_instruments_list.txt
similarity index 100%
rename from src/libs/sound/rt/midi_instruments_list.txt
rename to src/sound/rt/midi_instruments_list.txt
diff --git a/src/libs/sound/rt/readme b/src/sound/rt/readme
similarity index 100%
rename from src/libs/sound/rt/readme
rename to src/sound/rt/readme
diff --git a/src/libs/sound/rt/soundcard.h b/src/sound/rt/soundcard.h
similarity index 100%
rename from src/libs/sound/rt/soundcard.h
rename to src/sound/rt/soundcard.h
diff --git a/src/libs/sound/sound.pro b/src/sound/sound.pro
similarity index 100%
rename from src/libs/sound/sound.pro
rename to src/sound/sound.pro
diff --git a/src/sound/sounds b/src/sound/sounds
new file mode 120000
index 0000000000000000000000000000000000000000..c1e786814d57e5c510182e6d510b9e5c481330fa
--- /dev/null
+++ b/src/sound/sounds
@@ -0,0 +1 @@
+../../sounds
\ No newline at end of file
diff --git a/src/libs/sound/stouch/AAFilter.cpp b/src/sound/stouch/AAFilter.cpp
similarity index 100%
rename from src/libs/sound/stouch/AAFilter.cpp
rename to src/sound/stouch/AAFilter.cpp
diff --git a/src/libs/sound/stouch/AAFilter.h b/src/sound/stouch/AAFilter.h
similarity index 100%
rename from src/libs/sound/stouch/AAFilter.h
rename to src/sound/stouch/AAFilter.h
diff --git a/src/libs/sound/stouch/FIFOSampleBuffer.cpp b/src/sound/stouch/FIFOSampleBuffer.cpp
similarity index 100%
rename from src/libs/sound/stouch/FIFOSampleBuffer.cpp
rename to src/sound/stouch/FIFOSampleBuffer.cpp
diff --git a/src/libs/sound/stouch/FIFOSampleBuffer.h b/src/sound/stouch/FIFOSampleBuffer.h
similarity index 100%
rename from src/libs/sound/stouch/FIFOSampleBuffer.h
rename to src/sound/stouch/FIFOSampleBuffer.h
diff --git a/src/libs/sound/stouch/FIFOSamplePipe.h b/src/sound/stouch/FIFOSamplePipe.h
similarity index 100%
rename from src/libs/sound/stouch/FIFOSamplePipe.h
rename to src/sound/stouch/FIFOSamplePipe.h
diff --git a/src/libs/sound/stouch/FIRFilter.cpp b/src/sound/stouch/FIRFilter.cpp
similarity index 100%
rename from src/libs/sound/stouch/FIRFilter.cpp
rename to src/sound/stouch/FIRFilter.cpp
diff --git a/src/libs/sound/stouch/FIRFilter.h b/src/sound/stouch/FIRFilter.h
similarity index 100%
rename from src/libs/sound/stouch/FIRFilter.h
rename to src/sound/stouch/FIRFilter.h
diff --git a/src/libs/sound/stouch/InterpolateCubic.cpp b/src/sound/stouch/InterpolateCubic.cpp
similarity index 100%
rename from src/libs/sound/stouch/InterpolateCubic.cpp
rename to src/sound/stouch/InterpolateCubic.cpp
diff --git a/src/libs/sound/stouch/InterpolateCubic.h b/src/sound/stouch/InterpolateCubic.h
similarity index 100%
rename from src/libs/sound/stouch/InterpolateCubic.h
rename to src/sound/stouch/InterpolateCubic.h
diff --git a/src/libs/sound/stouch/InterpolateLinear.cpp b/src/sound/stouch/InterpolateLinear.cpp
similarity index 100%
rename from src/libs/sound/stouch/InterpolateLinear.cpp
rename to src/sound/stouch/InterpolateLinear.cpp
diff --git a/src/libs/sound/stouch/InterpolateLinear.h b/src/sound/stouch/InterpolateLinear.h
similarity index 100%
rename from src/libs/sound/stouch/InterpolateLinear.h
rename to src/sound/stouch/InterpolateLinear.h
diff --git a/src/libs/sound/stouch/InterpolateShannon.cpp b/src/sound/stouch/InterpolateShannon.cpp
similarity index 100%
rename from src/libs/sound/stouch/InterpolateShannon.cpp
rename to src/sound/stouch/InterpolateShannon.cpp
diff --git a/src/libs/sound/stouch/InterpolateShannon.h b/src/sound/stouch/InterpolateShannon.h
similarity index 100%
rename from src/libs/sound/stouch/InterpolateShannon.h
rename to src/sound/stouch/InterpolateShannon.h
diff --git a/src/libs/sound/stouch/README.html b/src/sound/stouch/README.html
similarity index 100%
rename from src/libs/sound/stouch/README.html
rename to src/sound/stouch/README.html
diff --git a/src/libs/sound/stouch/RateTransposer.cpp b/src/sound/stouch/RateTransposer.cpp
similarity index 100%
rename from src/libs/sound/stouch/RateTransposer.cpp
rename to src/sound/stouch/RateTransposer.cpp
diff --git a/src/libs/sound/stouch/RateTransposer.h b/src/sound/stouch/RateTransposer.h
similarity index 100%
rename from src/libs/sound/stouch/RateTransposer.h
rename to src/sound/stouch/RateTransposer.h
diff --git a/src/libs/sound/stouch/STTypes.h b/src/sound/stouch/STTypes.h
similarity index 100%
rename from src/libs/sound/stouch/STTypes.h
rename to src/sound/stouch/STTypes.h
diff --git a/src/libs/sound/stouch/SoundTouch.cpp b/src/sound/stouch/SoundTouch.cpp
similarity index 100%
rename from src/libs/sound/stouch/SoundTouch.cpp
rename to src/sound/stouch/SoundTouch.cpp
diff --git a/src/libs/sound/stouch/SoundTouch.h b/src/sound/stouch/SoundTouch.h
similarity index 100%
rename from src/libs/sound/stouch/SoundTouch.h
rename to src/sound/stouch/SoundTouch.h
diff --git a/src/libs/sound/stouch/TDStretch.cpp b/src/sound/stouch/TDStretch.cpp
similarity index 100%
rename from src/libs/sound/stouch/TDStretch.cpp
rename to src/sound/stouch/TDStretch.cpp
diff --git a/src/libs/sound/stouch/TDStretch.h b/src/sound/stouch/TDStretch.h
similarity index 100%
rename from src/libs/sound/stouch/TDStretch.h
rename to src/sound/stouch/TDStretch.h
diff --git a/src/libs/sound/stouch/cpu_detect.h b/src/sound/stouch/cpu_detect.h
similarity index 100%
rename from src/libs/sound/stouch/cpu_detect.h
rename to src/sound/stouch/cpu_detect.h
diff --git a/src/libs/sound/stouch/cpu_detect_x86.cpp b/src/sound/stouch/cpu_detect_x86.cpp
similarity index 100%
rename from src/libs/sound/stouch/cpu_detect_x86.cpp
rename to src/sound/stouch/cpu_detect_x86.cpp
diff --git a/src/libs/sound/stouch/mmx_optimized.cpp b/src/sound/stouch/mmx_optimized.cpp
similarity index 100%
rename from src/libs/sound/stouch/mmx_optimized.cpp
rename to src/sound/stouch/mmx_optimized.cpp
diff --git a/src/libs/sound/stouch/soundtouch_config.h b/src/sound/stouch/soundtouch_config.h
similarity index 100%
rename from src/libs/sound/stouch/soundtouch_config.h
rename to src/sound/stouch/soundtouch_config.h
diff --git a/src/libs/sound/stouch/sse_optimized.cpp b/src/sound/stouch/sse_optimized.cpp
similarity index 100%
rename from src/libs/sound/stouch/sse_optimized.cpp
rename to src/sound/stouch/sse_optimized.cpp
diff --git a/src/libs/sound/tabstractplayer.cpp b/src/sound/tabstractplayer.cpp
similarity index 100%
rename from src/libs/sound/tabstractplayer.cpp
rename to src/sound/tabstractplayer.cpp
diff --git a/src/libs/sound/tabstractplayer.h b/src/sound/tabstractplayer.h
similarity index 100%
rename from src/libs/sound/tabstractplayer.h
rename to src/sound/tabstractplayer.h
diff --git a/src/libs/sound/tartini/LICENSE.txt b/src/sound/tartini/LICENSE.txt
similarity index 100%
rename from src/libs/sound/tartini/LICENSE.txt
rename to src/sound/tartini/LICENSE.txt
diff --git a/src/libs/sound/tartini/README b/src/sound/tartini/README
similarity index 100%
rename from src/libs/sound/tartini/README
rename to src/sound/tartini/README
diff --git a/src/libs/sound/tartini/SmartPtr.h b/src/sound/tartini/SmartPtr.h
similarity index 100%
rename from src/libs/sound/tartini/SmartPtr.h
rename to src/sound/tartini/SmartPtr.h
diff --git a/src/libs/sound/tartini/analysisdata.cpp b/src/sound/tartini/analysisdata.cpp
similarity index 100%
rename from src/libs/sound/tartini/analysisdata.cpp
rename to src/sound/tartini/analysisdata.cpp
diff --git a/src/libs/sound/tartini/analysisdata.h b/src/sound/tartini/analysisdata.h
similarity index 100%
rename from src/libs/sound/tartini/analysisdata.h
rename to src/sound/tartini/analysisdata.h
diff --git a/src/libs/sound/tartini/array1d.h b/src/sound/tartini/array1d.h
similarity index 100%
rename from src/libs/sound/tartini/array1d.h
rename to src/sound/tartini/array1d.h
diff --git a/src/libs/sound/tartini/bspline.cpp b/src/sound/tartini/bspline.cpp
similarity index 100%
rename from src/libs/sound/tartini/bspline.cpp
rename to src/sound/tartini/bspline.cpp
diff --git a/src/libs/sound/tartini/bspline.h b/src/sound/tartini/bspline.h
similarity index 100%
rename from src/libs/sound/tartini/bspline.h
rename to src/sound/tartini/bspline.h
diff --git a/src/libs/sound/tartini/channel.cpp b/src/sound/tartini/channel.cpp
similarity index 100%
rename from src/libs/sound/tartini/channel.cpp
rename to src/sound/tartini/channel.cpp
diff --git a/src/libs/sound/tartini/channel.h b/src/sound/tartini/channel.h
similarity index 100%
rename from src/libs/sound/tartini/channel.h
rename to src/sound/tartini/channel.h
diff --git a/src/libs/sound/tartini/conversions.cpp b/src/sound/tartini/conversions.cpp
similarity index 100%
rename from src/libs/sound/tartini/conversions.cpp
rename to src/sound/tartini/conversions.cpp
diff --git a/src/libs/sound/tartini/conversions.h b/src/sound/tartini/conversions.h
similarity index 100%
rename from src/libs/sound/tartini/conversions.h
rename to src/sound/tartini/conversions.h
diff --git a/src/libs/sound/tartini/fast_smooth.cpp b/src/sound/tartini/fast_smooth.cpp
similarity index 100%
rename from src/libs/sound/tartini/fast_smooth.cpp
rename to src/sound/tartini/fast_smooth.cpp
diff --git a/src/libs/sound/tartini/fast_smooth.h b/src/sound/tartini/fast_smooth.h
similarity index 100%
rename from src/libs/sound/tartini/fast_smooth.h
rename to src/sound/tartini/fast_smooth.h
diff --git a/src/libs/sound/tartini/filters/FastSmoothedAveragingFilter.cpp b/src/sound/tartini/filters/FastSmoothedAveragingFilter.cpp
similarity index 100%
rename from src/libs/sound/tartini/filters/FastSmoothedAveragingFilter.cpp
rename to src/sound/tartini/filters/FastSmoothedAveragingFilter.cpp
diff --git a/src/libs/sound/tartini/filters/FastSmoothedAveragingFilter.h b/src/sound/tartini/filters/FastSmoothedAveragingFilter.h
similarity index 100%
rename from src/libs/sound/tartini/filters/FastSmoothedAveragingFilter.h
rename to src/sound/tartini/filters/FastSmoothedAveragingFilter.h
diff --git a/src/libs/sound/tartini/filters/Filter.h b/src/sound/tartini/filters/Filter.h
similarity index 100%
rename from src/libs/sound/tartini/filters/Filter.h
rename to src/sound/tartini/filters/Filter.h
diff --git a/src/libs/sound/tartini/filters/FixedAveragingFilter.cpp b/src/sound/tartini/filters/FixedAveragingFilter.cpp
similarity index 100%
rename from src/libs/sound/tartini/filters/FixedAveragingFilter.cpp
rename to src/sound/tartini/filters/FixedAveragingFilter.cpp
diff --git a/src/libs/sound/tartini/filters/FixedAveragingFilter.h b/src/sound/tartini/filters/FixedAveragingFilter.h
similarity index 100%
rename from src/libs/sound/tartini/filters/FixedAveragingFilter.h
rename to src/sound/tartini/filters/FixedAveragingFilter.h
diff --git a/src/libs/sound/tartini/filters/GrowingAveragingFilter.cpp b/src/sound/tartini/filters/GrowingAveragingFilter.cpp
similarity index 100%
rename from src/libs/sound/tartini/filters/GrowingAveragingFilter.cpp
rename to src/sound/tartini/filters/GrowingAveragingFilter.cpp
diff --git a/src/libs/sound/tartini/filters/GrowingAveragingFilter.h b/src/sound/tartini/filters/GrowingAveragingFilter.h
similarity index 100%
rename from src/libs/sound/tartini/filters/GrowingAveragingFilter.h
rename to src/sound/tartini/filters/GrowingAveragingFilter.h
diff --git a/src/libs/sound/tartini/filters/IIR_Filter.cpp b/src/sound/tartini/filters/IIR_Filter.cpp
similarity index 100%
rename from src/libs/sound/tartini/filters/IIR_Filter.cpp
rename to src/sound/tartini/filters/IIR_Filter.cpp
diff --git a/src/libs/sound/tartini/filters/IIR_Filter.h b/src/sound/tartini/filters/IIR_Filter.h
similarity index 100%
rename from src/libs/sound/tartini/filters/IIR_Filter.h
rename to src/sound/tartini/filters/IIR_Filter.h
diff --git a/src/libs/sound/tartini/large_vector.h b/src/sound/tartini/large_vector.h
similarity index 100%
rename from src/libs/sound/tartini/large_vector.h
rename to src/sound/tartini/large_vector.h
diff --git a/src/libs/sound/tartini/mytransforms.cpp b/src/sound/tartini/mytransforms.cpp
similarity index 100%
rename from src/libs/sound/tartini/mytransforms.cpp
rename to src/sound/tartini/mytransforms.cpp
diff --git a/src/libs/sound/tartini/mytransforms.h b/src/sound/tartini/mytransforms.h
similarity index 100%
rename from src/libs/sound/tartini/mytransforms.h
rename to src/sound/tartini/mytransforms.h
diff --git a/src/libs/sound/tartini/notedata.cpp b/src/sound/tartini/notedata.cpp
similarity index 100%
rename from src/libs/sound/tartini/notedata.cpp
rename to src/sound/tartini/notedata.cpp
diff --git a/src/libs/sound/tartini/notedata.h b/src/sound/tartini/notedata.h
similarity index 100%
rename from src/libs/sound/tartini/notedata.h
rename to src/sound/tartini/notedata.h
diff --git a/src/libs/sound/tartini/useful.cpp b/src/sound/tartini/useful.cpp
similarity index 100%
rename from src/libs/sound/tartini/useful.cpp
rename to src/sound/tartini/useful.cpp
diff --git a/src/libs/sound/tartini/useful.h b/src/sound/tartini/useful.h
similarity index 100%
rename from src/libs/sound/tartini/useful.h
rename to src/sound/tartini/useful.h
diff --git a/src/libs/sound/tartiniparams.h b/src/sound/tartiniparams.h
similarity index 100%
rename from src/libs/sound/tartiniparams.h
rename to src/sound/tartiniparams.h
diff --git a/src/libs/sound/tasioemitter.h b/src/sound/tasioemitter.h
similarity index 100%
rename from src/libs/sound/tasioemitter.h
rename to src/sound/tasioemitter.h
diff --git a/src/libs/sound/taudiobuffer.h b/src/sound/taudiobuffer.h
similarity index 100%
rename from src/libs/sound/taudiobuffer.h
rename to src/sound/taudiobuffer.h
diff --git a/src/libs/sound/taudioobject.h b/src/sound/taudioobject.h
similarity index 100%
rename from src/libs/sound/taudioobject.h
rename to src/sound/taudioobject.h
diff --git a/src/libs/sound/tcommonlistener.cpp b/src/sound/tcommonlistener.cpp
similarity index 100%
rename from src/libs/sound/tcommonlistener.cpp
rename to src/sound/tcommonlistener.cpp
diff --git a/src/libs/sound/tcommonlistener.h b/src/sound/tcommonlistener.h
similarity index 100%
rename from src/libs/sound/tcommonlistener.h
rename to src/sound/tcommonlistener.h
diff --git a/src/libs/sound/tmidiout.cpp b/src/sound/tmidiout.cpp
similarity index 100%
rename from src/libs/sound/tmidiout.cpp
rename to src/sound/tmidiout.cpp
diff --git a/src/libs/sound/tmidiout.h b/src/sound/tmidiout.h
similarity index 100%
rename from src/libs/sound/tmidiout.h
rename to src/sound/tmidiout.h
diff --git a/src/libs/sound/tnotesbaritem.cpp b/src/sound/tnotesbaritem.cpp
similarity index 100%
rename from src/libs/sound/tnotesbaritem.cpp
rename to src/sound/tnotesbaritem.cpp
diff --git a/src/libs/sound/tnotesbaritem.h b/src/sound/tnotesbaritem.h
similarity index 100%
rename from src/libs/sound/tnotesbaritem.h
rename to src/sound/tnotesbaritem.h
diff --git a/src/libs/sound/toggscale.cpp b/src/sound/toggscale.cpp
similarity index 100%
rename from src/libs/sound/toggscale.cpp
rename to src/sound/toggscale.cpp
diff --git a/src/libs/sound/toggscale.h b/src/sound/toggscale.h
similarity index 100%
rename from src/libs/sound/toggscale.h
rename to src/sound/toggscale.h
diff --git a/src/libs/sound/tonsetlogic.cpp b/src/sound/tonsetlogic.cpp
similarity index 100%
rename from src/libs/sound/tonsetlogic.cpp
rename to src/sound/tonsetlogic.cpp
diff --git a/src/libs/sound/tonsetlogic.h b/src/sound/tonsetlogic.h
similarity index 100%
rename from src/libs/sound/tonsetlogic.h
rename to src/sound/tonsetlogic.h
diff --git a/src/libs/sound/tpitchfinder.cpp b/src/sound/tpitchfinder.cpp
similarity index 100%
rename from src/libs/sound/tpitchfinder.cpp
rename to src/sound/tpitchfinder.cpp
diff --git a/src/libs/sound/tpitchfinder.h b/src/sound/tpitchfinder.h
similarity index 100%
rename from src/libs/sound/tpitchfinder.h
rename to src/sound/tpitchfinder.h
diff --git a/src/libs/sound/tqtaudioin.cpp b/src/sound/tqtaudioin.cpp
similarity index 100%
rename from src/libs/sound/tqtaudioin.cpp
rename to src/sound/tqtaudioin.cpp
diff --git a/src/libs/sound/tqtaudioin.h b/src/sound/tqtaudioin.h
similarity index 100%
rename from src/libs/sound/tqtaudioin.h
rename to src/sound/tqtaudioin.h
diff --git a/src/libs/sound/tqtaudioout.cpp b/src/sound/tqtaudioout.cpp
similarity index 100%
rename from src/libs/sound/tqtaudioout.cpp
rename to src/sound/tqtaudioout.cpp
diff --git a/src/libs/sound/tqtaudioout.h b/src/sound/tqtaudioout.h
similarity index 100%
rename from src/libs/sound/tqtaudioout.h
rename to src/sound/tqtaudioout.h
diff --git a/src/libs/sound/trtaudio.cpp b/src/sound/trtaudio.cpp
similarity index 100%
rename from src/libs/sound/trtaudio.cpp
rename to src/sound/trtaudio.cpp
diff --git a/src/libs/sound/trtaudio.h b/src/sound/trtaudio.h
similarity index 100%
rename from src/libs/sound/trtaudio.h
rename to src/sound/trtaudio.h
diff --git a/src/libs/sound/trtaudioin.cpp b/src/sound/trtaudioin.cpp
similarity index 100%
rename from src/libs/sound/trtaudioin.cpp
rename to src/sound/trtaudioin.cpp
diff --git a/src/libs/sound/trtaudioin.h b/src/sound/trtaudioin.h
similarity index 100%
rename from src/libs/sound/trtaudioin.h
rename to src/sound/trtaudioin.h
diff --git a/src/libs/sound/trtaudioout.cpp b/src/sound/trtaudioout.cpp
similarity index 100%
rename from src/libs/sound/trtaudioout.cpp
rename to src/sound/trtaudioout.cpp
diff --git a/src/libs/sound/trtaudioout.h b/src/sound/trtaudioout.h
similarity index 100%
rename from src/libs/sound/trtaudioout.h
rename to src/sound/trtaudioout.h
diff --git a/src/libs/sound/tsound.cpp b/src/sound/tsound.cpp
similarity index 100%
rename from src/libs/sound/tsound.cpp
rename to src/sound/tsound.cpp
diff --git a/src/libs/sound/tsound.h b/src/sound/tsound.h
similarity index 100%
rename from src/libs/sound/tsound.h
rename to src/sound/tsound.h
diff --git a/src/libs/sound/ttickcolors.cpp b/src/sound/ttickcolors.cpp
similarity index 100%
rename from src/libs/sound/ttickcolors.cpp
rename to src/sound/ttickcolors.cpp
diff --git a/src/libs/sound/ttickcolors.h b/src/sound/ttickcolors.h
similarity index 100%
rename from src/libs/sound/ttickcolors.h
rename to src/sound/ttickcolors.h
diff --git a/src/libs/sound/vorbis b/src/sound/vorbis
similarity index 100%
rename from src/libs/sound/vorbis
rename to src/sound/vorbis