diff --git a/Android.mk b/Android.mk
index e3d5a5f..bb0d2b5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,14 +30,14 @@ LOCAL_SRC_FILES := \
 ./os/android/AudioInputOpenSLES.cpp \
 ./controller/MediaStreamItf.cpp \
 ./audio/AudioOutput.cpp \
-./OpusEncoder.cpp \
+./controller/audio/OpusEncoder.cpp \
 ./os/android/AudioOutputOpenSLES.cpp \
 ./controller/net/JitterBuffer.cpp \
-./OpusDecoder.cpp \
+./controller/audio/OpusDecoder.cpp \
 ./os/android/OpenSLEngineWrapper.cpp \
 ./os/android/AudioInputAndroid.cpp \
 ./os/android/AudioOutputAndroid.cpp \
-./EchoCanceller.cpp \
+./controller/audio/EchoCanceller.cpp \
 ./controller/net/CongestionControl.cpp \
 ./VoIPServerConfig.cpp \
 ./audio/Resampler.cpp \
diff --git a/Makefile.am b/Makefile.am
index 9649d08..620a84a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,14 +8,14 @@ SRC = TgVoip.cpp \
 VoIPController.cpp \
 tools/Buffers.cpp \
 controller/net/CongestionControl.cpp \
-EchoCanceller.cpp \
+controller/audio/EchoCanceller.cpp \
 controller/net/JitterBuffer.cpp \
 tools/logging.cpp \
 controller/MediaStreamItf.cpp \
 tools/MessageThread.cpp \
 controller/net/NetworkSocket.cpp \
-OpusDecoder.cpp \
-OpusEncoder.cpp \
+controller/audio/OpusDecoder.cpp \
+controller/audio/OpusEncoder.cpp \
 controller/PacketReassembler.cpp \
 VoIPGroupController.cpp \
 VoIPServerConfig.cpp \
@@ -45,8 +45,8 @@ tools/threading.h \
 controller/MediaStreamItf.h \
 tools/MessageThread.h \
 controller/net/NetworkSocket.h \
-OpusDecoder.h \
-OpusEncoder.h \
+controller/audio/OpusDecoder.h \
+controller/audio/OpusEncoder.h \
 controller/PacketReassembler.h \
 VoIPServerConfig.h \
 audio/AudioIO.h \
diff --git a/Makefile.in b/Makefile.in
index 00a99da..afa3bcf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -809,10 +809,14 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libtgvoip_la_LIBADD =
 am__libtgvoip_la_SOURCES_DIST = TgVoip.cpp VoIPController.cpp \
-	tools/Buffers.cpp controller/net/CongestionControl.cpp EchoCanceller.cpp \
-	controller/net/JitterBuffer.cpp tools/logging.cpp controller/MediaStreamItf.cpp \
-	tools/MessageThread.cpp controller/net/NetworkSocket.cpp OpusDecoder.cpp \
-	OpusEncoder.cpp controller/PacketReassembler.cpp VoIPGroupController.cpp \
+	tools/Buffers.cpp controller/net/CongestionControl.cpp \
+	controller/audio/EchoCanceller.cpp \
+	controller/net/JitterBuffer.cpp tools/logging.cpp \
+	controller/MediaStreamItf.cpp tools/MessageThread.cpp \
+	controller/net/NetworkSocket.cpp \
+	controller/audio/OpusDecoder.cpp \
+	controller/audio/OpusEncoder.cpp \
+	controller/PacketReassembler.cpp VoIPGroupController.cpp \
 	VoIPServerConfig.cpp audio/AudioIO.cpp audio/AudioInput.cpp \
 	audio/AudioOutput.cpp audio/Resampler.cpp \
 	os/posix/NetworkSocketPosix.cpp video/VideoSource.cpp \
@@ -1151,7 +1155,8 @@ am__libtgvoip_la_SOURCES_DIST = TgVoip.cpp VoIPController.cpp \
 	webrtc_dsp/rtc_base/deprecation.h \
 	webrtc_dsp/rtc_base/sanitizer.h \
 	webrtc_dsp/rtc_base/scoped_ref_ptr.h \
-	webrtc_dsp/rtc_base/tools/logging.h webrtc_dsp/rtc_base/timetools/utils.h \
+	webrtc_dsp/rtc_base/tools/logging.h \
+	webrtc_dsp/rtc_base/timetools/utils.h \
 	webrtc_dsp/rtc_base/atomicops.h \
 	webrtc_dsp/rtc_base/numerics/safe_minmax.h \
 	webrtc_dsp/rtc_base/numerics/safe_conversions.h \
@@ -1423,16 +1428,19 @@ am__libtgvoip_la_SOURCES_DIST = TgVoip.cpp VoIPController.cpp \
 	webrtc_dsp/common_audio/vad/vad_gmm.h \
 	webrtc_dsp/common_audio/vad/vad_sp.h \
 	webrtc_dsp/common_audio/vad/vad_filterbank.h TgVoip.h \
-	VoIPController.h tools/Buffers.h tools/BlockingQueue.h controller/PrivateDefines.h \
-	controller/net/CongestionControl.h controller/audio/EchoCanceller.h controller/net/JitterBuffer.h tools/logging.h \
-	tools/threading.h controller/MediaStreamItf.h tools/MessageThread.h controller/net/NetworkSocket.h \
-	OpusDecoder.h OpusEncoder.h controller/PacketReassembler.h \
-	VoIPServerConfig.h audio/AudioIO.h audio/AudioInput.h \
-	audio/AudioOutput.h audio/Resampler.h \
-	os/posix/NetworkSocketPosix.h video/VideoSource.h \
-	video/Videocontroller/PacketSender.h video/VideoFEC.h \
-	video/VideoRenderer.h video/ScreamCongestionController.h \
-	json11.hpp tools/utils.h os/darwin/AudioInputAudioUnit.h \
+	VoIPController.h tools/Buffers.h tools/BlockingQueue.h \
+	controller/PrivateDefines.h controller/net/CongestionControl.h \
+	controller/audio/EchoCanceller.h controller/net/JitterBuffer.h \
+	tools/logging.h tools/threading.h controller/MediaStreamItf.h \
+	tools/MessageThread.h controller/net/NetworkSocket.h \
+	controller/audio/OpusDecoder.h controller/audio/OpusEncoder.h \
+	controller/PacketReassembler.h VoIPServerConfig.h \
+	audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \
+	audio/Resampler.h os/posix/NetworkSocketPosix.h \
+	video/VideoSource.h video/Videocontroller/PacketSender.h \
+	video/VideoFEC.h video/VideoRenderer.h \
+	video/ScreamCongestionController.h json11.hpp tools/utils.h \
+	os/darwin/AudioInputAudioUnit.h \
 	os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \
 	os/darwin/AudioInputAudioUnitOSX.h \
 	os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \
@@ -1738,19 +1746,24 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @ENABLE_DSP_TRUE@@TARGET_CPU_ARM_FALSE@am__objects_10 = webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.lo \
 @ENABLE_DSP_TRUE@@TARGET_CPU_ARM_FALSE@	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.lo
 am__objects_11 =
-am__objects_12 = TgVoip.lo VoIPController.lo Buffers.lo \
-	CongestionControl.lo EchoCanceller.lo JitterBuffer.lo \
-	logging.lo MediaStreamItf.lo MessageThread.lo NetworkSocket.lo \
-	OpusDecoder.lo OpusEncoder.lo PacketReassembler.lo \
-	VoIPGroupController.lo VoIPServerConfig.lo audio/AudioIO.lo \
-	audio/AudioInput.lo audio/AudioOutput.lo audio/Resampler.lo \
+am__objects_12 = TgVoip.lo VoIPController.lo tools/Buffers.lo \
+	controller/net/CongestionControl.lo \
+	controller/audio/EchoCanceller.lo \
+	controller/net/JitterBuffer.lo tools/logging.lo \
+	controller/MediaStreamItf.lo tools/MessageThread.lo \
+	controller/net/NetworkSocket.lo \
+	controller/audio/OpusDecoder.lo \
+	controller/audio/OpusEncoder.lo \
+	controller/PacketReassembler.lo VoIPGroupController.lo \
+	VoIPServerConfig.lo audio/AudioIO.lo audio/AudioInput.lo \
+	audio/AudioOutput.lo audio/Resampler.lo \
 	os/posix/NetworkSocketPosix.lo video/VideoSource.lo \
 	video/VideoRenderer.lo video/VideoPacketSender.lo \
 	video/VideoFEC.lo video/ScreamCongestionController.lo \
-	json11.lo $(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
-	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
-	$(am__objects_10) $(am__objects_11)
+	tools/json11.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
+	$(am__objects_9) $(am__objects_10) $(am__objects_11)
 am__objects_13 = $(am__objects_11) $(am__objects_11) $(am__objects_11) \
 	$(am__objects_11)
 am_libtgvoip_la_OBJECTS = $(am__objects_12) $(am__objects_13)
@@ -1774,16 +1787,10 @@ am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/Buffers.Plo \
-	./$(DEPDIR)/CongestionControl.Plo \
-	./$(DEPDIR)/EchoCanceller.Plo ./$(DEPDIR)/JitterBuffer.Plo \
-	./$(DEPDIR)/MediaStreamItf.Plo ./$(DEPDIR)/MessageThread.Plo \
-	./$(DEPDIR)/NetworkSocket.Plo ./$(DEPDIR)/OpusDecoder.Plo \
-	./$(DEPDIR)/OpusEncoder.Plo ./$(DEPDIR)/PacketReassembler.Plo \
-	./$(DEPDIR)/TgVoip.Plo ./$(DEPDIR)/VoIPController.Plo \
+am__depfiles_remade = ./$(DEPDIR)/TgVoip.Plo \
+	./$(DEPDIR)/VoIPController.Plo \
 	./$(DEPDIR)/VoIPGroupController.Plo \
-	./$(DEPDIR)/VoIPServerConfig.Plo ./$(DEPDIR)/json11.Plo \
-	./$(DEPDIR)/logging.Plo \
+	./$(DEPDIR)/VoIPServerConfig.Plo \
 	./webrtc_dsp/absl/base/internal/$(DEPDIR)/raw_logging.Plo \
 	./webrtc_dsp/absl/base/internal/$(DEPDIR)/throw_delegate.Plo \
 	./webrtc_dsp/absl/strings/$(DEPDIR)/ascii.Plo \
@@ -2051,6 +2058,14 @@ am__depfiles_remade = ./$(DEPDIR)/Buffers.Plo \
 	audio/$(DEPDIR)/AudioIOCallback.Plo \
 	audio/$(DEPDIR)/AudioInput.Plo audio/$(DEPDIR)/AudioOutput.Plo \
 	audio/$(DEPDIR)/Resampler.Plo \
+	controller/$(DEPDIR)/MediaStreamItf.Plo \
+	controller/$(DEPDIR)/PacketReassembler.Plo \
+	controller/audio/$(DEPDIR)/EchoCanceller.Plo \
+	controller/audio/$(DEPDIR)/OpusDecoder.Plo \
+	controller/audio/$(DEPDIR)/OpusEncoder.Plo \
+	controller/net/$(DEPDIR)/CongestionControl.Plo \
+	controller/net/$(DEPDIR)/JitterBuffer.Plo \
+	controller/net/$(DEPDIR)/NetworkSocket.Plo \
 	os/darwin/$(DEPDIR)/AudioInputAudioUnit.Plo \
 	os/darwin/$(DEPDIR)/AudioInputAudioUnitOSX.Plo \
 	os/darwin/$(DEPDIR)/AudioOutputAudioUnit.Plo \
@@ -2067,6 +2082,8 @@ am__depfiles_remade = ./$(DEPDIR)/Buffers.Plo \
 	os/linux/$(DEPDIR)/AudioOutputPulse.Plo \
 	os/linux/$(DEPDIR)/AudioPulse.Plo \
 	os/posix/$(DEPDIR)/NetworkSocketPosix.Plo \
+	tools/$(DEPDIR)/Buffers.Plo tools/$(DEPDIR)/MessageThread.Plo \
+	tools/$(DEPDIR)/json11.Plo tools/$(DEPDIR)/logging.Plo \
 	video/$(DEPDIR)/ScreamCongestionController.Plo \
 	video/$(DEPDIR)/VideoFEC.Plo \
 	video/$(DEPDIR)/VideoPacketSender.Plo \
@@ -2159,15 +2176,19 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__nobase_tgvoipinclude_HEADERS_DIST = TgVoip.h VoIPController.h \
-	tools/Buffers.h tools/BlockingQueue.h controller/PrivateDefines.h controller/net/CongestionControl.h \
-	controller/audio/EchoCanceller.h controller/net/JitterBuffer.h tools/logging.h tools/threading.h \
-	controller/MediaStreamItf.h tools/MessageThread.h controller/net/NetworkSocket.h OpusDecoder.h \
-	OpusEncoder.h controller/PacketReassembler.h VoIPServerConfig.h \
+	tools/Buffers.h tools/BlockingQueue.h \
+	controller/PrivateDefines.h controller/net/CongestionControl.h \
+	controller/audio/EchoCanceller.h controller/net/JitterBuffer.h \
+	tools/logging.h tools/threading.h controller/MediaStreamItf.h \
+	tools/MessageThread.h controller/net/NetworkSocket.h \
+	controller/audio/OpusDecoder.h controller/audio/OpusEncoder.h \
+	controller/PacketReassembler.h VoIPServerConfig.h \
 	audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \
 	audio/Resampler.h os/posix/NetworkSocketPosix.h \
-	video/VideoSource.h video/Videocontroller/PacketSender.h video/VideoFEC.h \
-	video/VideoRenderer.h video/ScreamCongestionController.h \
-	json11.hpp tools/utils.h os/darwin/AudioInputAudioUnit.h \
+	video/VideoSource.h video/Videocontroller/PacketSender.h \
+	video/VideoFEC.h video/VideoRenderer.h \
+	video/ScreamCongestionController.h json11.hpp tools/utils.h \
+	os/darwin/AudioInputAudioUnit.h \
 	os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \
 	os/darwin/AudioInputAudioUnitOSX.h \
 	os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \
@@ -2352,30 +2373,39 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 lib_LTLIBRARIES = libtgvoip.la
-SRC = TgVoip.cpp VoIPController.cpp tools/Buffers.cpp controller/net/CongestionControl.cpp \
-	EchoCanceller.cpp controller/net/JitterBuffer.cpp tools/logging.cpp \
-	controller/MediaStreamItf.cpp tools/MessageThread.cpp controller/net/NetworkSocket.cpp \
-	OpusDecoder.cpp OpusEncoder.cpp controller/PacketReassembler.cpp \
-	VoIPGroupController.cpp VoIPServerConfig.cpp audio/AudioIO.cpp \
-	audio/AudioInput.cpp audio/AudioOutput.cpp audio/Resampler.cpp \
+SRC = TgVoip.cpp VoIPController.cpp tools/Buffers.cpp \
+	controller/net/CongestionControl.cpp \
+	controller/audio/EchoCanceller.cpp \
+	controller/net/JitterBuffer.cpp tools/logging.cpp \
+	controller/MediaStreamItf.cpp tools/MessageThread.cpp \
+	controller/net/NetworkSocket.cpp \
+	controller/audio/OpusDecoder.cpp \
+	controller/audio/OpusEncoder.cpp \
+	controller/PacketReassembler.cpp VoIPGroupController.cpp \
+	VoIPServerConfig.cpp audio/AudioIO.cpp audio/AudioInput.cpp \
+	audio/AudioOutput.cpp audio/Resampler.cpp \
 	os/posix/NetworkSocketPosix.cpp video/VideoSource.cpp \
 	video/VideoRenderer.cpp video/VideoPacketSender.cpp \
 	video/VideoFEC.cpp video/ScreamCongestionController.cpp \
-	tools/json11.cpp $(am__append_1) $(am__append_4) $(am__append_6) \
-	$(am__append_10) $(am__append_12) $(am__append_14) \
-	$(am__append_16) $(am__append_18) $(am__append_21) \
-	$(am__append_22) $(am__append_23)
-TGVOIP_HDRS = TgVoip.h VoIPController.h tools/Buffers.h tools/BlockingQueue.h \
-	controller/PrivateDefines.h controller/net/CongestionControl.h controller/audio/EchoCanceller.h \
-	controller/net/JitterBuffer.h tools/logging.h tools/threading.h controller/MediaStreamItf.h \
-	tools/MessageThread.h controller/net/NetworkSocket.h OpusDecoder.h OpusEncoder.h \
-	controller/PacketReassembler.h VoIPServerConfig.h audio/AudioIO.h \
-	audio/AudioInput.h audio/AudioOutput.h audio/Resampler.h \
-	os/posix/NetworkSocketPosix.h video/VideoSource.h \
-	video/Videocontroller/PacketSender.h video/VideoFEC.h \
-	video/VideoRenderer.h video/ScreamCongestionController.h \
-	json11.hpp tools/utils.h $(am__append_2) $(am__append_5) \
-	$(am__append_7) $(am__append_17)
+	tools/json11.cpp $(am__append_1) $(am__append_4) \
+	$(am__append_6) $(am__append_10) $(am__append_12) \
+	$(am__append_14) $(am__append_16) $(am__append_18) \
+	$(am__append_21) $(am__append_22) $(am__append_23)
+TGVOIP_HDRS = TgVoip.h VoIPController.h tools/Buffers.h \
+	tools/BlockingQueue.h controller/PrivateDefines.h \
+	controller/net/CongestionControl.h \
+	controller/audio/EchoCanceller.h controller/net/JitterBuffer.h \
+	tools/logging.h tools/threading.h controller/MediaStreamItf.h \
+	tools/MessageThread.h controller/net/NetworkSocket.h \
+	controller/audio/OpusDecoder.h controller/audio/OpusEncoder.h \
+	controller/PacketReassembler.h VoIPServerConfig.h \
+	audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \
+	audio/Resampler.h os/posix/NetworkSocketPosix.h \
+	video/VideoSource.h video/Videocontroller/PacketSender.h \
+	video/VideoFEC.h video/VideoRenderer.h \
+	video/ScreamCongestionController.h json11.hpp tools/utils.h \
+	$(am__append_2) $(am__append_5) $(am__append_7) \
+	$(am__append_17)
 libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
 tgvoipincludedir = $(includedir)/tgvoip
 nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS)
@@ -2468,6 +2498,52 @@ clean-libLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+tools/$(am__dirstamp):
+	@$(MKDIR_P) tools
+	@: > tools/$(am__dirstamp)
+tools/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) tools/$(DEPDIR)
+	@: > tools/$(DEPDIR)/$(am__dirstamp)
+tools/Buffers.lo: tools/$(am__dirstamp) \
+	tools/$(DEPDIR)/$(am__dirstamp)
+controller/net/$(am__dirstamp):
+	@$(MKDIR_P) controller/net
+	@: > controller/net/$(am__dirstamp)
+controller/net/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) controller/net/$(DEPDIR)
+	@: > controller/net/$(DEPDIR)/$(am__dirstamp)
+controller/net/CongestionControl.lo: controller/net/$(am__dirstamp) \
+	controller/net/$(DEPDIR)/$(am__dirstamp)
+controller/audio/$(am__dirstamp):
+	@$(MKDIR_P) controller/audio
+	@: > controller/audio/$(am__dirstamp)
+controller/audio/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) controller/audio/$(DEPDIR)
+	@: > controller/audio/$(DEPDIR)/$(am__dirstamp)
+controller/audio/EchoCanceller.lo: controller/audio/$(am__dirstamp) \
+	controller/audio/$(DEPDIR)/$(am__dirstamp)
+controller/net/JitterBuffer.lo: controller/net/$(am__dirstamp) \
+	controller/net/$(DEPDIR)/$(am__dirstamp)
+tools/logging.lo: tools/$(am__dirstamp) \
+	tools/$(DEPDIR)/$(am__dirstamp)
+controller/$(am__dirstamp):
+	@$(MKDIR_P) controller
+	@: > controller/$(am__dirstamp)
+controller/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) controller/$(DEPDIR)
+	@: > controller/$(DEPDIR)/$(am__dirstamp)
+controller/MediaStreamItf.lo: controller/$(am__dirstamp) \
+	controller/$(DEPDIR)/$(am__dirstamp)
+tools/MessageThread.lo: tools/$(am__dirstamp) \
+	tools/$(DEPDIR)/$(am__dirstamp)
+controller/net/NetworkSocket.lo: controller/net/$(am__dirstamp) \
+	controller/net/$(DEPDIR)/$(am__dirstamp)
+controller/audio/OpusDecoder.lo: controller/audio/$(am__dirstamp) \
+	controller/audio/$(DEPDIR)/$(am__dirstamp)
+controller/audio/OpusEncoder.lo: controller/audio/$(am__dirstamp) \
+	controller/audio/$(DEPDIR)/$(am__dirstamp)
+controller/PacketReassembler.lo: controller/$(am__dirstamp) \
+	controller/$(DEPDIR)/$(am__dirstamp)
 audio/$(am__dirstamp):
 	@$(MKDIR_P) audio
 	@: > audio/$(am__dirstamp)
@@ -2506,6 +2582,7 @@ video/VideoFEC.lo: video/$(am__dirstamp) \
 	video/$(DEPDIR)/$(am__dirstamp)
 video/ScreamCongestionController.lo: video/$(am__dirstamp) \
 	video/$(DEPDIR)/$(am__dirstamp)
+tools/json11.lo: tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp)
 os/darwin/$(am__dirstamp):
 	@$(MKDIR_P) os/darwin
 	@: > os/darwin/$(am__dirstamp)
@@ -3613,12 +3690,20 @@ mostlyclean-compile:
 	-rm -f ./webrtc_dsp/third_party/rnnoise/src/*.lo
 	-rm -f audio/*.$(OBJEXT)
 	-rm -f audio/*.lo
+	-rm -f controller/*.$(OBJEXT)
+	-rm -f controller/*.lo
+	-rm -f controller/audio/*.$(OBJEXT)
+	-rm -f controller/audio/*.lo
+	-rm -f controller/net/*.$(OBJEXT)
+	-rm -f controller/net/*.lo
 	-rm -f os/darwin/*.$(OBJEXT)
 	-rm -f os/darwin/*.lo
 	-rm -f os/linux/*.$(OBJEXT)
 	-rm -f os/linux/*.lo
 	-rm -f os/posix/*.$(OBJEXT)
 	-rm -f os/posix/*.lo
+	-rm -f tools/*.$(OBJEXT)
+	-rm -f tools/*.lo
 	-rm -f video/*.$(OBJEXT)
 	-rm -f video/*.lo
 	-rm -f webrtc_dsp/common_audio/signal_processing/*.$(OBJEXT)
@@ -3639,22 +3724,10 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Buffers.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CongestionControl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EchoCanceller.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JitterBuffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MediaStreamItf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageThread.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkSocket.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpusDecoder.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpusEncoder.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PacketReassembler.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TgVoip.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VoIPController.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VoIPGroupController.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VoIPServerConfig.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json11.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/base/internal/$(DEPDIR)/raw_logging.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/base/internal/$(DEPDIR)/throw_delegate.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/strings/$(DEPDIR)/ascii.Plo@am__quote@ # am--include-marker
@@ -3923,6 +3996,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@audio/$(DEPDIR)/AudioInput.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@audio/$(DEPDIR)/AudioOutput.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@audio/$(DEPDIR)/Resampler.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@controller/$(DEPDIR)/MediaStreamItf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@controller/$(DEPDIR)/PacketReassembler.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@controller/audio/$(DEPDIR)/EchoCanceller.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@controller/audio/$(DEPDIR)/OpusDecoder.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@controller/audio/$(DEPDIR)/OpusEncoder.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@controller/net/$(DEPDIR)/CongestionControl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@controller/net/$(DEPDIR)/JitterBuffer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@controller/net/$(DEPDIR)/NetworkSocket.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioInputAudioUnit.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioInputAudioUnitOSX.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioOutputAudioUnit.Plo@am__quote@ # am--include-marker
@@ -3939,6 +4020,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioOutputPulse.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioPulse.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@os/posix/$(DEPDIR)/NetworkSocketPosix.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/Buffers.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/MessageThread.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/json11.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/logging.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/ScreamCongestionController.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/VideoFEC.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/VideoPacketSender.Plo@am__quote@ # am--include-marker
@@ -4124,9 +4209,13 @@ clean-libtool:
 	-rm -rf ./webrtc_dsp/system_wrappers/source/.libs ./webrtc_dsp/system_wrappers/source/_libs
 	-rm -rf ./webrtc_dsp/third_party/rnnoise/src/.libs ./webrtc_dsp/third_party/rnnoise/src/_libs
 	-rm -rf audio/.libs audio/_libs
+	-rm -rf controller/.libs controller/_libs
+	-rm -rf controller/audio/.libs controller/audio/_libs
+	-rm -rf controller/net/.libs controller/net/_libs
 	-rm -rf os/darwin/.libs os/darwin/_libs
 	-rm -rf os/linux/.libs os/linux/_libs
 	-rm -rf os/posix/.libs os/posix/_libs
+	-rm -rf tools/.libs tools/_libs
 	-rm -rf video/.libs video/_libs
 	-rm -rf webrtc_dsp/common_audio/signal_processing/.libs webrtc_dsp/common_audio/signal_processing/_libs
 	-rm -rf webrtc_dsp/common_audio/third_party/spl_sqrt_floor/.libs webrtc_dsp/common_audio/third_party/spl_sqrt_floor/_libs
@@ -4423,12 +4512,20 @@ distclean-generic:
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-rm -f audio/$(DEPDIR)/$(am__dirstamp)
 	-rm -f audio/$(am__dirstamp)
+	-rm -f controller/$(DEPDIR)/$(am__dirstamp)
+	-rm -f controller/$(am__dirstamp)
+	-rm -f controller/audio/$(DEPDIR)/$(am__dirstamp)
+	-rm -f controller/audio/$(am__dirstamp)
+	-rm -f controller/net/$(DEPDIR)/$(am__dirstamp)
+	-rm -f controller/net/$(am__dirstamp)
 	-rm -f os/darwin/$(DEPDIR)/$(am__dirstamp)
 	-rm -f os/darwin/$(am__dirstamp)
 	-rm -f os/linux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f os/linux/$(am__dirstamp)
 	-rm -f os/posix/$(DEPDIR)/$(am__dirstamp)
 	-rm -f os/posix/$(am__dirstamp)
+	-rm -f tools/$(DEPDIR)/$(am__dirstamp)
+	-rm -f tools/$(am__dirstamp)
 	-rm -f video/$(DEPDIR)/$(am__dirstamp)
 	-rm -f video/$(am__dirstamp)
 	-rm -f webrtc_dsp/absl/base/internal/$(DEPDIR)/$(am__dirstamp)
@@ -4510,22 +4607,10 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-		-rm -f ./$(DEPDIR)/Buffers.Plo
-	-rm -f ./$(DEPDIR)/CongestionControl.Plo
-	-rm -f ./$(DEPDIR)/EchoCanceller.Plo
-	-rm -f ./$(DEPDIR)/JitterBuffer.Plo
-	-rm -f ./$(DEPDIR)/MediaStreamItf.Plo
-	-rm -f ./$(DEPDIR)/MessageThread.Plo
-	-rm -f ./$(DEPDIR)/NetworkSocket.Plo
-	-rm -f ./$(DEPDIR)/OpusDecoder.Plo
-	-rm -f ./$(DEPDIR)/OpusEncoder.Plo
-	-rm -f ./$(DEPDIR)/PacketReassembler.Plo
-	-rm -f ./$(DEPDIR)/TgVoip.Plo
+		-rm -f ./$(DEPDIR)/TgVoip.Plo
 	-rm -f ./$(DEPDIR)/VoIPController.Plo
 	-rm -f ./$(DEPDIR)/VoIPGroupController.Plo
 	-rm -f ./$(DEPDIR)/VoIPServerConfig.Plo
-	-rm -f ./$(DEPDIR)/json11.Plo
-	-rm -f ./$(DEPDIR)/logging.Plo
 	-rm -f ./webrtc_dsp/absl/base/internal/$(DEPDIR)/raw_logging.Plo
 	-rm -f ./webrtc_dsp/absl/base/internal/$(DEPDIR)/throw_delegate.Plo
 	-rm -f ./webrtc_dsp/absl/strings/$(DEPDIR)/ascii.Plo
@@ -4794,6 +4879,14 @@ distclean: distclean-am
 	-rm -f audio/$(DEPDIR)/AudioInput.Plo
 	-rm -f audio/$(DEPDIR)/AudioOutput.Plo
 	-rm -f audio/$(DEPDIR)/Resampler.Plo
+	-rm -f controller/$(DEPDIR)/MediaStreamItf.Plo
+	-rm -f controller/$(DEPDIR)/PacketReassembler.Plo
+	-rm -f controller/audio/$(DEPDIR)/EchoCanceller.Plo
+	-rm -f controller/audio/$(DEPDIR)/OpusDecoder.Plo
+	-rm -f controller/audio/$(DEPDIR)/OpusEncoder.Plo
+	-rm -f controller/net/$(DEPDIR)/CongestionControl.Plo
+	-rm -f controller/net/$(DEPDIR)/JitterBuffer.Plo
+	-rm -f controller/net/$(DEPDIR)/NetworkSocket.Plo
 	-rm -f os/darwin/$(DEPDIR)/AudioInputAudioUnit.Plo
 	-rm -f os/darwin/$(DEPDIR)/AudioInputAudioUnitOSX.Plo
 	-rm -f os/darwin/$(DEPDIR)/AudioOutputAudioUnit.Plo
@@ -4810,6 +4903,10 @@ distclean: distclean-am
 	-rm -f os/linux/$(DEPDIR)/AudioOutputPulse.Plo
 	-rm -f os/linux/$(DEPDIR)/AudioPulse.Plo
 	-rm -f os/posix/$(DEPDIR)/NetworkSocketPosix.Plo
+	-rm -f tools/$(DEPDIR)/Buffers.Plo
+	-rm -f tools/$(DEPDIR)/MessageThread.Plo
+	-rm -f tools/$(DEPDIR)/json11.Plo
+	-rm -f tools/$(DEPDIR)/logging.Plo
 	-rm -f video/$(DEPDIR)/ScreamCongestionController.Plo
 	-rm -f video/$(DEPDIR)/VideoFEC.Plo
 	-rm -f video/$(DEPDIR)/VideoPacketSender.Plo
@@ -4876,22 +4973,10 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-		-rm -f ./$(DEPDIR)/Buffers.Plo
-	-rm -f ./$(DEPDIR)/CongestionControl.Plo
-	-rm -f ./$(DEPDIR)/EchoCanceller.Plo
-	-rm -f ./$(DEPDIR)/JitterBuffer.Plo
-	-rm -f ./$(DEPDIR)/MediaStreamItf.Plo
-	-rm -f ./$(DEPDIR)/MessageThread.Plo
-	-rm -f ./$(DEPDIR)/NetworkSocket.Plo
-	-rm -f ./$(DEPDIR)/OpusDecoder.Plo
-	-rm -f ./$(DEPDIR)/OpusEncoder.Plo
-	-rm -f ./$(DEPDIR)/PacketReassembler.Plo
-	-rm -f ./$(DEPDIR)/TgVoip.Plo
+		-rm -f ./$(DEPDIR)/TgVoip.Plo
 	-rm -f ./$(DEPDIR)/VoIPController.Plo
 	-rm -f ./$(DEPDIR)/VoIPGroupController.Plo
 	-rm -f ./$(DEPDIR)/VoIPServerConfig.Plo
-	-rm -f ./$(DEPDIR)/json11.Plo
-	-rm -f ./$(DEPDIR)/logging.Plo
 	-rm -f ./webrtc_dsp/absl/base/internal/$(DEPDIR)/raw_logging.Plo
 	-rm -f ./webrtc_dsp/absl/base/internal/$(DEPDIR)/throw_delegate.Plo
 	-rm -f ./webrtc_dsp/absl/strings/$(DEPDIR)/ascii.Plo
@@ -5160,6 +5245,14 @@ maintainer-clean: maintainer-clean-am
 	-rm -f audio/$(DEPDIR)/AudioInput.Plo
 	-rm -f audio/$(DEPDIR)/AudioOutput.Plo
 	-rm -f audio/$(DEPDIR)/Resampler.Plo
+	-rm -f controller/$(DEPDIR)/MediaStreamItf.Plo
+	-rm -f controller/$(DEPDIR)/PacketReassembler.Plo
+	-rm -f controller/audio/$(DEPDIR)/EchoCanceller.Plo
+	-rm -f controller/audio/$(DEPDIR)/OpusDecoder.Plo
+	-rm -f controller/audio/$(DEPDIR)/OpusEncoder.Plo
+	-rm -f controller/net/$(DEPDIR)/CongestionControl.Plo
+	-rm -f controller/net/$(DEPDIR)/JitterBuffer.Plo
+	-rm -f controller/net/$(DEPDIR)/NetworkSocket.Plo
 	-rm -f os/darwin/$(DEPDIR)/AudioInputAudioUnit.Plo
 	-rm -f os/darwin/$(DEPDIR)/AudioInputAudioUnitOSX.Plo
 	-rm -f os/darwin/$(DEPDIR)/AudioOutputAudioUnit.Plo
@@ -5176,6 +5269,10 @@ maintainer-clean: maintainer-clean-am
 	-rm -f os/linux/$(DEPDIR)/AudioOutputPulse.Plo
 	-rm -f os/linux/$(DEPDIR)/AudioPulse.Plo
 	-rm -f os/posix/$(DEPDIR)/NetworkSocketPosix.Plo
+	-rm -f tools/$(DEPDIR)/Buffers.Plo
+	-rm -f tools/$(DEPDIR)/MessageThread.Plo
+	-rm -f tools/$(DEPDIR)/json11.Plo
+	-rm -f tools/$(DEPDIR)/logging.Plo
 	-rm -f video/$(DEPDIR)/ScreamCongestionController.Plo
 	-rm -f video/$(DEPDIR)/VideoFEC.Plo
 	-rm -f video/$(DEPDIR)/VideoPacketSender.Plo
diff --git a/VoIPController.cpp b/VoIPController.cpp
index 9b1d411..064b005 100644
--- a/VoIPController.cpp
+++ b/VoIPController.cpp
@@ -15,8 +15,8 @@
 #include "tools/logging.h"
 #include "tools/threading.h"
 #include "tools/Buffers.h"
-#include "OpusEncoder.h"
-#include "OpusDecoder.h"
+#include "controller/audio/OpusEncoder.h"
+#include "controller/audio/OpusDecoder.h"
 #include "VoIPServerConfig.h"
 #include "controller/PrivateDefines.h"
 #include "json11.hpp"
diff --git a/VoIPController.h b/VoIPController.h
index f2eb767..f7dc41f 100755
--- a/VoIPController.h
+++ b/VoIPController.h
@@ -31,8 +31,8 @@
 #include "audio/AudioOutput.h"
 #include "audio/AudioIO.h"
 #include "controller/net/JitterBuffer.h"
-#include "OpusDecoder.h"
-#include "OpusEncoder.h"
+#include "controller/audio/OpusDecoder.h"
+#include "controller/audio/OpusEncoder.h"
 #include "controller/audio/EchoCanceller.h"
 #include "controller/net/CongestionControl.h"
 #include "controller/net/NetworkSocket.h"
diff --git a/controller/audio/EchoCanceller.o b/controller/audio/EchoCanceller.o
index 89d680b..4b08ecb 100644
Binary files a/controller/audio/EchoCanceller.o and b/controller/audio/EchoCanceller.o differ
diff --git a/controller/audio/OpusDecoder.cpp b/controller/audio/OpusDecoder.cpp
index c2552cd..4ce94d7 100755
--- a/controller/audio/OpusDecoder.cpp
+++ b/controller/audio/OpusDecoder.cpp
@@ -4,7 +4,7 @@
 // you should have received with this source code distribution.
 //
 
-#include "OpusDecoder.h"
+#include "controller/audio/OpusDecoder.h"
 #include "audio/Resampler.h"
 #include "tools/logging.h"
 #include <assert.h>
diff --git a/controller/audio/OpusDecoder.o b/controller/audio/OpusDecoder.o
index 06dfe23..e380950 100644
Binary files a/controller/audio/OpusDecoder.o and b/controller/audio/OpusDecoder.o differ
diff --git a/controller/audio/OpusEncoder.cpp b/controller/audio/OpusEncoder.cpp
index 1a97028..9b235da 100755
--- a/controller/audio/OpusEncoder.cpp
+++ b/controller/audio/OpusEncoder.cpp
@@ -4,7 +4,7 @@
 // you should have received with this source code distribution.
 //
 
-#include "OpusEncoder.h"
+#include "controller/audio/OpusEncoder.h"
 #include <assert.h>
 #include <algorithm>
 #include "tools/logging.h"
diff --git a/controller/audio/OpusEncoder.o b/controller/audio/OpusEncoder.o
index 026a511..2df369d 100644
Binary files a/controller/audio/OpusEncoder.o and b/controller/audio/OpusEncoder.o differ
diff --git a/libtgvoip.UWP.vcxproj b/libtgvoip.UWP.vcxproj
index 6bdc33e..0ef41d1 100644
--- a/libtgvoip.UWP.vcxproj
+++ b/libtgvoip.UWP.vcxproj
@@ -249,8 +249,8 @@
     <ClInclude Include="controller/MediaStreamItf.h" />
     <ClInclude Include="tools/MessageThread.h" />
     <ClInclude Include="controller/net/NetworkSocket.h" />
-    <ClInclude Include="OpusDecoder.h" />
-    <ClInclude Include="OpusEncoder.h" />
+    <ClInclude Include="controller/audio/OpusDecoder.h" />
+    <ClInclude Include="controller/audio/OpusEncoder.h" />
     <ClInclude Include="os\windows\AudioInputWASAPI.h" />
     <ClInclude Include="os\windows\AudioOutputWASAPI.h" />
     <ClInclude Include="os\windows\NetworkSocketWinsock.h" />
@@ -597,15 +597,15 @@
     <ClCompile Include="tools/BlockingQueue.cpp" />
     <ClCompile Include="tools/Buffers.cpp" />
     <ClCompile Include="controller/net/CongestionControl.cpp" />
-    <ClCompile Include="EchoCanceller.cpp" />
+    <ClCompile Include="controller/audio/EchoCanceller.cpp" />
     <ClCompile Include="controller/net/JitterBuffer.cpp" />
     <ClCompile Include="tools/json11.cpp" />
     <ClCompile Include="tools/logging.cpp" />
     <ClCompile Include="controller/MediaStreamItf.cpp" />
     <ClCompile Include="tools/MessageThread.cpp" />
     <ClCompile Include="controller/net/NetworkSocket.cpp" />
-    <ClCompile Include="OpusDecoder.cpp" />
-    <ClCompile Include="OpusEncoder.cpp" />
+    <ClCompile Include="controller/audio/OpusDecoder.cpp" />
+    <ClCompile Include="controller/audio/OpusEncoder.cpp" />
     <ClCompile Include="os\windows\AudioInputWASAPI.cpp" />
     <ClCompile Include="os\windows\AudioOutputWASAPI.cpp" />
     <ClCompile Include="os\windows\NetworkSocketWinsock.cpp" />
diff --git a/libtgvoip.UWP.vcxproj.filters b/libtgvoip.UWP.vcxproj.filters
index 83b8c96..5682add 100644
--- a/libtgvoip.UWP.vcxproj.filters
+++ b/libtgvoip.UWP.vcxproj.filters
@@ -24,13 +24,13 @@
     <ClCompile Include="tools/BlockingQueue.cpp" />
     <ClCompile Include="tools/Buffers.cpp" />
     <ClCompile Include="controller/net/CongestionControl.cpp" />
-    <ClCompile Include="EchoCanceller.cpp" />
+    <ClCompile Include="controller/audio/EchoCanceller.cpp" />
     <ClCompile Include="controller/net/JitterBuffer.cpp" />
     <ClCompile Include="tools/logging.cpp" />
     <ClCompile Include="controller/MediaStreamItf.cpp" />
     <ClCompile Include="controller/net/NetworkSocket.cpp" />
-    <ClCompile Include="OpusDecoder.cpp" />
-    <ClCompile Include="OpusEncoder.cpp" />
+    <ClCompile Include="controller/audio/OpusDecoder.cpp" />
+    <ClCompile Include="controller/audio/OpusEncoder.cpp" />
     <ClCompile Include="audio\AudioInput.cpp">
       <Filter>audio</Filter>
     </ClCompile>
@@ -921,8 +921,8 @@
     <ClInclude Include="tools/logging.h" />
     <ClInclude Include="controller/MediaStreamItf.h" />
     <ClInclude Include="controller/net/NetworkSocket.h" />
-    <ClInclude Include="OpusDecoder.h" />
-    <ClInclude Include="OpusEncoder.h" />
+    <ClInclude Include="controller/audio/OpusDecoder.h" />
+    <ClInclude Include="controller/audio/OpusEncoder.h" />
     <ClInclude Include="tools/threading.h" />
     <ClInclude Include="audio\AudioInput.h">
       <Filter>audio</Filter>
diff --git a/libtgvoip.WP81.vcxproj b/libtgvoip.WP81.vcxproj
index 1208fb5..cea32ab 100644
--- a/libtgvoip.WP81.vcxproj
+++ b/libtgvoip.WP81.vcxproj
@@ -155,8 +155,8 @@
     <ClInclude Include="controller/MediaStreamItf.h" />
     <ClInclude Include="tools/MessageThread.h" />
     <ClInclude Include="controller/net/NetworkSocket.h" />
-    <ClInclude Include="OpusDecoder.h" />
-    <ClInclude Include="OpusEncoder.h" />
+    <ClInclude Include="controller/audio/OpusDecoder.h" />
+    <ClInclude Include="controller/audio/OpusEncoder.h" />
     <ClInclude Include="os\windows\AudioInputWASAPI.h" />
     <ClInclude Include="os\windows\AudioOutputWASAPI.h" />
     <ClInclude Include="os\windows\NetworkSocketWinsock.h" />
@@ -233,14 +233,14 @@
     <ClCompile Include="tools/BlockingQueue.cpp" />
     <ClCompile Include="tools/Buffers.cpp" />
     <ClCompile Include="controller/net/CongestionControl.cpp" />
-    <ClCompile Include="EchoCanceller.cpp" />
+    <ClCompile Include="controller/audio/EchoCanceller.cpp" />
     <ClCompile Include="controller/net/JitterBuffer.cpp" />
     <ClCompile Include="tools/logging.cpp" />
     <ClCompile Include="controller/MediaStreamItf.cpp" />
     <ClCompile Include="tools/MessageThread.cpp" />
     <ClCompile Include="controller/net/NetworkSocket.cpp" />
-    <ClCompile Include="OpusDecoder.cpp" />
-    <ClCompile Include="OpusEncoder.cpp" />
+    <ClCompile Include="controller/audio/OpusDecoder.cpp" />
+    <ClCompile Include="controller/audio/OpusEncoder.cpp" />
     <ClCompile Include="os\windows\AudioInputWASAPI.cpp" />
     <ClCompile Include="os\windows\AudioOutputWASAPI.cpp" />
     <ClCompile Include="os\windows\NetworkSocketWinsock.cpp" />
diff --git a/libtgvoip.WP81.vcxproj.filters b/libtgvoip.WP81.vcxproj.filters
index a1e94b1..4df561c 100755
--- a/libtgvoip.WP81.vcxproj.filters
+++ b/libtgvoip.WP81.vcxproj.filters
@@ -20,13 +20,13 @@
     <ClCompile Include="VoIPServerConfig.cpp" />
     <ClCompile Include="tools/BlockingQueue.cpp" />
     <ClCompile Include="controller/net/CongestionControl.cpp" />
-    <ClCompile Include="EchoCanceller.cpp" />
+    <ClCompile Include="controller/audio/EchoCanceller.cpp" />
     <ClCompile Include="controller/net/JitterBuffer.cpp" />
     <ClCompile Include="tools/logging.cpp" />
     <ClCompile Include="controller/MediaStreamItf.cpp" />
     <ClCompile Include="controller/net/NetworkSocket.cpp" />
-    <ClCompile Include="OpusDecoder.cpp" />
-    <ClCompile Include="OpusEncoder.cpp" />
+    <ClCompile Include="controller/audio/OpusDecoder.cpp" />
+    <ClCompile Include="controller/audio/OpusEncoder.cpp" />
     <ClCompile Include="audio\AudioInput.cpp">
       <Filter>audio</Filter>
     </ClCompile>
@@ -283,7 +283,7 @@
     <ClInclude Include="controller/MediaStreamItf.h" />
     <ClInclude Include="controller/net/NetworkSocket.h" />
     <ClInclude Include="controller/audio/OpusDecoder.h" />
-    <ClInclude Include="OpusEncoder.h" />
+    <ClInclude Include="controller/audio/OpusEncoder.h" />
     <ClInclude Include="tools/threading.h" />
     <ClInclude Include="audio\AudioInput.h">
       <Filter>audio</Filter>
diff --git a/libtgvoip.gyp b/libtgvoip.gyp
index f4e8039..155cbfe 100644
--- a/libtgvoip.gyp
+++ b/libtgvoip.gyp
@@ -33,7 +33,7 @@
           '<(tgvoip_src_loc)/tools/Buffers.h',
           '<(tgvoip_src_loc)/controller/net/CongestionControl.cpp',
           '<(tgvoip_src_loc)/controller/net/CongestionControl.h',
-          '<(tgvoip_src_loc)/EchoCanceller.cpp',
+          '<(tgvoip_src_loc)/controller/audio/EchoCanceller.cpp',
           '<(tgvoip_src_loc)/controller/audio/EchoCanceller.h',
           '<(tgvoip_src_loc)/controller/net/JitterBuffer.cpp',
           '<(tgvoip_src_loc)/controller/net/JitterBuffer.h',
@@ -41,10 +41,10 @@
           '<(tgvoip_src_loc)/tools/logging.h',
           '<(tgvoip_src_loc)/controller/MediaStreamItf.cpp',
           '<(tgvoip_src_loc)/controller/MediaStreamItf.h',
-          '<(tgvoip_src_loc)/OpusDecoder.cpp',
+          '<(tgvoip_src_loc)/controller/audio/OpusDecoder.cpp',
           '<(tgvoip_src_loc)/controller/audio/OpusDecoder.h',
-          '<(tgvoip_src_loc)/OpusEncoder.cpp',
-          '<(tgvoip_src_loc)/OpusEncoder.h',
+          '<(tgvoip_src_loc)/controller/audio/OpusEncoder.cpp',
+          '<(tgvoip_src_loc)/controller/audio/OpusEncoder.h',
           '<(tgvoip_src_loc)/tools/threading.h',
           '<(tgvoip_src_loc)/VoIPController.cpp',
           '<(tgvoip_src_loc)/VoIPGroupController.cpp',
diff --git a/libtgvoip.xcodeproj/project.pbxproj b/libtgvoip.xcodeproj/project.pbxproj
index b34741e..b9bd5a3 100644
--- a/libtgvoip.xcodeproj/project.pbxproj
+++ b/libtgvoip.xcodeproj/project.pbxproj
@@ -14,11 +14,11 @@
 		692AB8CD1E6759DD00706ACC /* AudioOutput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB88A1E6759DD00706ACC /* AudioOutput.cpp */; };
 		692AB8CF1E6759DD00706ACC /* tools/BlockingQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB88C1E6759DD00706ACC /* tools/BlockingQueue.cpp */; };
 		692AB8D81E6759DD00706ACC /* controller/net/CongestionControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8971E6759DD00706ACC /* controller/net/CongestionControl.cpp */; };
-		692AB8DA1E6759DD00706ACC /* EchoCanceller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8991E6759DD00706ACC /* EchoCanceller.cpp */; };
+		692AB8DA1E6759DD00706ACC /* controller/audio/EchoCanceller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8991E6759DD00706ACC /* controller/audio/EchoCanceller.cpp */; };
 		692AB8E61E6759DD00706ACC /* controller/net/JitterBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8A81E6759DD00706ACC /* controller/net/JitterBuffer.cpp */; };
 		692AB8E91E6759DD00706ACC /* controller/MediaStreamItf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AB1E6759DD00706ACC /* controller/MediaStreamItf.cpp */; };
-		692AB8EB1E6759DD00706ACC /* OpusDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AD1E6759DD00706ACC /* OpusDecoder.cpp */; };
-		692AB8ED1E6759DD00706ACC /* OpusEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AF1E6759DD00706ACC /* OpusEncoder.cpp */; };
+		692AB8EB1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AD1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp */; };
+		692AB8ED1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AF1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp */; };
 		692AB8F91E6759DD00706ACC /* AudioInputAudioUnit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8BE1E6759DD00706ACC /* AudioInputAudioUnit.cpp */; };
 		692AB8FB1E6759DD00706ACC /* AudioOutputAudioUnit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8C01E6759DD00706ACC /* AudioOutputAudioUnit.cpp */; };
 		692AB8FD1E6759DD00706ACC /* AudioUnitIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8C21E6759DD00706ACC /* AudioUnitIO.cpp */; };
@@ -397,7 +397,7 @@
 		692AB88D1E6759DD00706ACC /* tools/BlockingQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tools/BlockingQueue.h; sourceTree = "<group>"; };
 		692AB8971E6759DD00706ACC /* controller/net/CongestionControl.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = controller/net/CongestionControl.cpp; sourceTree = "<group>"; };
 		692AB8981E6759DD00706ACC /* controller/net/CongestionControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/net/CongestionControl.h; sourceTree = "<group>"; };
-		692AB8991E6759DD00706ACC /* EchoCanceller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EchoCanceller.cpp; sourceTree = "<group>"; };
+		692AB8991E6759DD00706ACC /* controller/audio/EchoCanceller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/audio/EchoCanceller.cpp; sourceTree = "<group>"; };
 		692AB89A1E6759DD00706ACC /* controller/audio/EchoCanceller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/audio/EchoCanceller.h; sourceTree = "<group>"; };
 		692AB8A71E6759DD00706ACC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		692AB8A81E6759DD00706ACC /* controller/net/JitterBuffer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = controller/net/JitterBuffer.cpp; sourceTree = "<group>"; };
@@ -405,10 +405,10 @@
 		692AB8AA1E6759DD00706ACC /* tools/logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tools/logging.h; sourceTree = "<group>"; };
 		692AB8AB1E6759DD00706ACC /* controller/MediaStreamItf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/MediaStreamItf.cpp; sourceTree = "<group>"; };
 		692AB8AC1E6759DD00706ACC /* controller/MediaStreamItf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/MediaStreamItf.h; sourceTree = "<group>"; };
-		692AB8AD1E6759DD00706ACC /* OpusDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpusDecoder.cpp; sourceTree = "<group>"; };
+		692AB8AD1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/audio/OpusDecoder.cpp; sourceTree = "<group>"; };
 		692AB8AE1E6759DD00706ACC /* controller/audio/OpusDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/audio/OpusDecoder.h; sourceTree = "<group>"; };
-		692AB8AF1E6759DD00706ACC /* OpusEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpusEncoder.cpp; sourceTree = "<group>"; };
-		692AB8B01E6759DD00706ACC /* OpusEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpusEncoder.h; sourceTree = "<group>"; };
+		692AB8AF1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/audio/OpusEncoder.cpp; sourceTree = "<group>"; };
+		692AB8B01E6759DD00706ACC /* controller/audio/OpusEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/audio/OpusEncoder.h; sourceTree = "<group>"; };
 		692AB8BE1E6759DD00706ACC /* AudioInputAudioUnit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioInputAudioUnit.cpp; sourceTree = "<group>"; };
 		692AB8BF1E6759DD00706ACC /* AudioInputAudioUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioInputAudioUnit.h; sourceTree = "<group>"; };
 		692AB8C01E6759DD00706ACC /* AudioOutputAudioUnit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioOutputAudioUnit.cpp; sourceTree = "<group>"; };
@@ -1094,7 +1094,7 @@
 				69986176209526D400B68BEC /* tools/Buffers.h */,
 				692AB8971E6759DD00706ACC /* controller/net/CongestionControl.cpp */,
 				692AB8981E6759DD00706ACC /* controller/net/CongestionControl.h */,
-				692AB8991E6759DD00706ACC /* EchoCanceller.cpp */,
+				692AB8991E6759DD00706ACC /* controller/audio/EchoCanceller.cpp */,
 				692AB89A1E6759DD00706ACC /* controller/audio/EchoCanceller.h */,
 				692AB8A71E6759DD00706ACC /* Info.plist */,
 				692AB8A81E6759DD00706ACC /* controller/net/JitterBuffer.cpp */,
@@ -1108,10 +1108,10 @@
 				69FB0B2C20F6860D00827817 /* tools/MessageThread.h */,
 				69015D921E9D848700AC9763 /* controller/net/NetworkSocket.cpp */,
 				69015D931E9D848700AC9763 /* controller/net/NetworkSocket.h */,
-				692AB8AD1E6759DD00706ACC /* OpusDecoder.cpp */,
+				692AB8AD1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp */,
 				692AB8AE1E6759DD00706ACC /* controller/audio/OpusDecoder.h */,
-				692AB8AF1E6759DD00706ACC /* OpusEncoder.cpp */,
-				692AB8B01E6759DD00706ACC /* OpusEncoder.h */,
+				692AB8AF1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp */,
+				692AB8B01E6759DD00706ACC /* controller/audio/OpusEncoder.h */,
 				699861792095292900B68BEC /* controller/PacketReassembler.cpp */,
 				6998617A2095292A00B68BEC /* controller/PacketReassembler.h */,
 				6929CD0F2233ED81009B7378 /* controller/PrivateDefines.h */,
@@ -2664,7 +2664,7 @@
 				697E9CB021A4ED6D00E03846 /* aec_core.cc in Sources */,
 				697E9B6221A4ED6B00E03846 /* resample_by_2_internal.c in Sources */,
 				697E9B6421A4ED6B00E03846 /* energy.c in Sources */,
-				692AB8EB1E6759DD00706ACC /* OpusDecoder.cpp in Sources */,
+				692AB8EB1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp in Sources */,
 				697E9B8821A4ED6B00E03846 /* vad_sp.c in Sources */,
 				697E9D2B21A4ED6D00E03846 /* reverb_decay_estimator.cc in Sources */,
 				697E9C2321A4ED6C00E03846 /* arith_routines.c in Sources */,
@@ -2730,7 +2730,7 @@
 				697E9B8A21A4ED6B00E03846 /* webrtc_vad.c in Sources */,
 				697E9D0221A4ED6D00E03846 /* aec_state.cc in Sources */,
 				697E9B3621A4ED6B00E03846 /* real_fourier_ooura.cc in Sources */,
-				692AB8DA1E6759DD00706ACC /* EchoCanceller.cpp in Sources */,
+				692AB8DA1E6759DD00706ACC /* controller/audio/EchoCanceller.cpp in Sources */,
 				697E9C7B21A4ED6C00E03846 /* features_extraction.cc in Sources */,
 				697E9D2C21A4ED6D00E03846 /* render_delay_controller2.cc in Sources */,
 				697E9CB321A4ED6D00E03846 /* aec_core_neon.cc in Sources */,
@@ -2822,7 +2822,7 @@
 				697E9CC121A4ED6D00E03846 /* digital_agc.c in Sources */,
 				697E9B2D21A4ED6B00E03846 /* channel_buffer.cc in Sources */,
 				697E9BB621A4ED6B00E03846 /* echo_canceller3_config.cc in Sources */,
-				692AB8ED1E6759DD00706ACC /* OpusEncoder.cpp in Sources */,
+				692AB8ED1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp in Sources */,
 				697E9B7E21A4ED6B00E03846 /* complex_bit_reverse.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/libtgvoip_osx.xcodeproj/project.pbxproj b/libtgvoip_osx.xcodeproj/project.pbxproj
index eae2933..954db27 100644
--- a/libtgvoip_osx.xcodeproj/project.pbxproj
+++ b/libtgvoip_osx.xcodeproj/project.pbxproj
@@ -293,11 +293,11 @@
 		692AB8D11E6759DD00706ACC /* tools/Buffers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB88E1E6759DD00706ACC /* tools/Buffers.cpp */; };
 		692AB8D31E6759DD00706ACC /* VoIPGroupController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8901E6759DD00706ACC /* VoIPGroupController.cpp */; };
 		692AB8D81E6759DD00706ACC /* controller/net/CongestionControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8971E6759DD00706ACC /* controller/net/CongestionControl.cpp */; };
-		692AB8DA1E6759DD00706ACC /* EchoCanceller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8991E6759DD00706ACC /* EchoCanceller.cpp */; };
+		692AB8DA1E6759DD00706ACC /* controller/audio/EchoCanceller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8991E6759DD00706ACC /* controller/audio/EchoCanceller.cpp */; };
 		692AB8E61E6759DD00706ACC /* controller/net/JitterBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8A81E6759DD00706ACC /* controller/net/JitterBuffer.cpp */; };
 		692AB8E91E6759DD00706ACC /* controller/MediaStreamItf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AB1E6759DD00706ACC /* controller/MediaStreamItf.cpp */; };
-		692AB8EB1E6759DD00706ACC /* OpusDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AD1E6759DD00706ACC /* OpusDecoder.cpp */; };
-		692AB8ED1E6759DD00706ACC /* OpusEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AF1E6759DD00706ACC /* OpusEncoder.cpp */; };
+		692AB8EB1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AD1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp */; };
+		692AB8ED1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8AF1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp */; };
 		692AB9021E6759DD00706ACC /* VoIPController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8C71E6759DD00706ACC /* VoIPController.cpp */; };
 		692AB9031E6759DD00706ACC /* VoIPController.h in Headers */ = {isa = PBXBuildFile; fileRef = 692AB8C81E6759DD00706ACC /* VoIPController.h */; };
 		692AB9041E6759DD00706ACC /* VoIPServerConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 692AB8C91E6759DD00706ACC /* VoIPServerConfig.cpp */; };
@@ -1017,7 +1017,7 @@
 		692AB8911E6759DD00706ACC /* controller/PrivateDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/PrivateDefines.h; sourceTree = SOURCE_ROOT; };
 		692AB8971E6759DD00706ACC /* controller/net/CongestionControl.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = controller/net/CongestionControl.cpp; sourceTree = SOURCE_ROOT; };
 		692AB8981E6759DD00706ACC /* controller/net/CongestionControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/net/CongestionControl.h; sourceTree = SOURCE_ROOT; };
-		692AB8991E6759DD00706ACC /* EchoCanceller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EchoCanceller.cpp; sourceTree = SOURCE_ROOT; };
+		692AB8991E6759DD00706ACC /* controller/audio/EchoCanceller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/audio/EchoCanceller.cpp; sourceTree = SOURCE_ROOT; };
 		692AB89A1E6759DD00706ACC /* controller/audio/EchoCanceller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/audio/EchoCanceller.h; sourceTree = SOURCE_ROOT; };
 		692AB8A71E6759DD00706ACC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		692AB8A81E6759DD00706ACC /* controller/net/JitterBuffer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = controller/net/JitterBuffer.cpp; sourceTree = SOURCE_ROOT; };
@@ -1025,10 +1025,10 @@
 		692AB8AA1E6759DD00706ACC /* tools/logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tools/logging.h; sourceTree = SOURCE_ROOT; };
 		692AB8AB1E6759DD00706ACC /* controller/MediaStreamItf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/MediaStreamItf.cpp; sourceTree = SOURCE_ROOT; };
 		692AB8AC1E6759DD00706ACC /* controller/MediaStreamItf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/MediaStreamItf.h; sourceTree = SOURCE_ROOT; };
-		692AB8AD1E6759DD00706ACC /* OpusDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpusDecoder.cpp; sourceTree = SOURCE_ROOT; };
+		692AB8AD1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/audio/OpusDecoder.cpp; sourceTree = SOURCE_ROOT; };
 		692AB8AE1E6759DD00706ACC /* controller/audio/OpusDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/audio/OpusDecoder.h; sourceTree = SOURCE_ROOT; };
-		692AB8AF1E6759DD00706ACC /* OpusEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpusEncoder.cpp; sourceTree = SOURCE_ROOT; };
-		692AB8B01E6759DD00706ACC /* OpusEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpusEncoder.h; sourceTree = SOURCE_ROOT; };
+		692AB8AF1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/audio/OpusEncoder.cpp; sourceTree = SOURCE_ROOT; };
+		692AB8B01E6759DD00706ACC /* controller/audio/OpusEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/audio/OpusEncoder.h; sourceTree = SOURCE_ROOT; };
 		692AB8C61E6759DD00706ACC /* tools/threading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tools/threading.h; sourceTree = SOURCE_ROOT; };
 		692AB8C71E6759DD00706ACC /* VoIPController.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = VoIPController.cpp; sourceTree = SOURCE_ROOT; };
 		692AB8C81E6759DD00706ACC /* VoIPController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoIPController.h; sourceTree = SOURCE_ROOT; };
@@ -2249,7 +2249,7 @@
 				692AB8911E6759DD00706ACC /* controller/PrivateDefines.h */,
 				692AB8971E6759DD00706ACC /* controller/net/CongestionControl.cpp */,
 				692AB8981E6759DD00706ACC /* controller/net/CongestionControl.h */,
-				692AB8991E6759DD00706ACC /* EchoCanceller.cpp */,
+				692AB8991E6759DD00706ACC /* controller/audio/EchoCanceller.cpp */,
 				692AB89A1E6759DD00706ACC /* controller/audio/EchoCanceller.h */,
 				692AB8A71E6759DD00706ACC /* Info.plist */,
 				692AB8A81E6759DD00706ACC /* controller/net/JitterBuffer.cpp */,
@@ -2263,10 +2263,10 @@
 				6976FD0220F6A7060019939E /* tools/MessageThread.h */,
 				690725C01EBBD5F2005D860B /* controller/net/NetworkSocket.cpp */,
 				690725C11EBBD5F2005D860B /* controller/net/NetworkSocket.h */,
-				692AB8AD1E6759DD00706ACC /* OpusDecoder.cpp */,
+				692AB8AD1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp */,
 				692AB8AE1E6759DD00706ACC /* controller/audio/OpusDecoder.h */,
-				692AB8AF1E6759DD00706ACC /* OpusEncoder.cpp */,
-				692AB8B01E6759DD00706ACC /* OpusEncoder.h */,
+				692AB8AF1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp */,
+				692AB8B01E6759DD00706ACC /* controller/audio/OpusEncoder.h */,
 				6971220D20C8107E00971C2C /* controller/PacketReassembler.cpp */,
 				6971220E20C8107F00971C2C /* controller/PacketReassembler.h */,
 				692AB8B11E6759DD00706ACC /* os */,
@@ -2735,7 +2735,7 @@
 				691E071C21A4FD7700F838EF /* aec_core.cc in Sources */,
 				691E069E21A4FD7600F838EF /* normalized_covariance_estimator.cc in Sources */,
 				692AB8D81E6759DD00706ACC /* controller/net/CongestionControl.cpp in Sources */,
-				692AB8EB1E6759DD00706ACC /* OpusDecoder.cpp in Sources */,
+				692AB8EB1E6759DD00706ACC /* controller/audio/OpusDecoder.cpp in Sources */,
 				69DF156D2237DEDC00C1F8ED /* TGVVideoRenderer.mm in Sources */,
 				691E071821A4FD7700F838EF /* echo_cancellation.cc in Sources */,
 				691E077821A4FD7700F838EF /* block_framer.cc in Sources */,
@@ -2859,7 +2859,7 @@
 				691E063F21A4FD7600F838EF /* get_hanning_window.c in Sources */,
 				691E07AF21A4FD7700F838EF /* comfort_noise_generator.cc in Sources */,
 				692AB8E91E6759DD00706ACC /* controller/MediaStreamItf.cpp in Sources */,
-				692AB8DA1E6759DD00706ACC /* EchoCanceller.cpp in Sources */,
+				692AB8DA1E6759DD00706ACC /* controller/audio/EchoCanceller.cpp in Sources */,
 				691E07BE21A4FD7700F838EF /* voice_activity_detector.cc in Sources */,
 				691E05F221A4FD7600F838EF /* real_fourier_ooura.cc in Sources */,
 				691E077521A4FD7700F838EF /* echo_path_delay_estimator.cc in Sources */,
@@ -2919,7 +2919,7 @@
 				691E069A21A4FD7600F838EF /* rms_level.cc in Sources */,
 				691E078E21A4FD7700F838EF /* reverb_model_estimator.cc in Sources */,
 				691E070121A4FD7600F838EF /* compute_interpolated_gain_curve.cc in Sources */,
-				692AB8ED1E6759DD00706ACC /* OpusEncoder.cpp in Sources */,
+				692AB8ED1E6759DD00706ACC /* controller/audio/OpusEncoder.cpp in Sources */,
 				691E06E721A4FD7600F838EF /* features_extraction.cc in Sources */,
 				691E061A21A4FD7600F838EF /* levinson_durbin.c in Sources */,
 				691E066921A4FD7600F838EF /* pitch_estimator.c in Sources */,
diff --git a/video/VideoFEC.h b/video/VideoFEC.h
index 3eaf87d..3f9d154 100644
--- a/video/VideoFEC.h
+++ b/video/VideoFEC.h
@@ -5,7 +5,7 @@
 #ifndef LIBTGVOIP_VIDEOFEC_H
 #define LIBTGVOIP_VIDEOFEC_H
 
-#include "../tools/tools/Buffers.h"
+#include "../tools/Buffers.h"
 #include <vector>
 
 namespace tgvoip{
diff --git a/video/VideoPacketSender.h b/video/VideoPacketSender.h
index f5704fe..8ca9055 100644
--- a/video/VideoPacketSender.h
+++ b/video/VideoPacketSender.h
@@ -6,8 +6,8 @@
 #define LIBTGVOIP_VIDEOPACKETSENDER_H
 
 #include "../controller/PacketSender.h"
-#include "../tools/tools/Buffers.h"
-#include "../tools/tools/threading.h"
+#include "../tools/Buffers.h"
+#include "../tools/threading.h"
 #include <memory>
 #include <stdint.h>
 #include <vector>
diff --git a/video/VideoRenderer.h b/video/VideoRenderer.h
index 79996b9..01567b2 100644
--- a/video/VideoRenderer.h
+++ b/video/VideoRenderer.h
@@ -6,7 +6,7 @@
 #define LIBTGVOIP_VIDEORENDERER_H
 
 #include <vector>
-#include "../tools/tools/Buffers.h"
+#include "../tools/Buffers.h"
 
 namespace tgvoip{
 	namespace video{
diff --git a/video/VideoSource.h b/video/VideoSource.h
index a4a7756..513976d 100644
--- a/video/VideoSource.h
+++ b/video/VideoSource.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 #include <stdint.h>
-#include "../tools/tools/Buffers.h"
+#include "../tools/Buffers.h"
 
 namespace tgvoip{
 	namespace video {