diff --git a/.gitmodules b/.gitmodules
index 50d4815..f636c2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "src/external/system_hardware_interfaces"]
-	path = src/external/system_hardware_interfaces
+[submodule "external/system_hardware_interfaces"]
+	path = external/system_hardware_interfaces
 	url = https://android.googlesource.com/platform/system/hardware/interfaces
-[submodule "src/external/hardware_interfaces"]
-	path = src/external/hardware_interfaces
+[submodule "external/hardware_interfaces"]
+	path = external/hardware_interfaces
 	url = https://android.googlesource.com/platform/hardware/interfaces
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e0ec9c..8cbb721 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,123 +13,66 @@ project("ViPER4Android")
 add_compile_definitions(VIPER_VERSION=20240314)
 add_compile_definitions(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
 
-## Find AIDL compiler
-#find_program(AIDL_COMPILER aidl
-#        PATHS ${ANDROID_SDK}/build-tools/*/
-#        NO_DEFAULT_PATH)
-#if(NOT AIDL_COMPILER)
-#    message(FATAL_ERROR "Could not find AIDL compiler in Android SDK build tools")
-#endif()
-#
-## Set up AIDL file generation
-#set(AIDL_FILE "/home/iscle/Downloads/interfaces-refs_heads_main/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/IEffect.aidl")
-#set(AIDL_INCLUDE_DIRS
-#        "/home/iscle/Downloads/interfaces-refs_heads_main/common/aidl/aidl_api/android.hardware.common/current/"
-#        "/home/iscle/Downloads/interfaces-refs_heads_main/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/"
-#        "/home/iscle/Downloads/interfaces-refs_heads_main/audio/aidl/aidl_api/android.hardware.audio.common/current/"
-#        "/home/iscle/Downloads/interfaces-refs_heads_main/audio/aidl/aidl_api/android.hardware.audio.effect/current/"
-#        "/home/iscle/Downloads/interfaces-refs_heads_main (1)/media/aidl_api/android.media.audio.common.types/current/"
-#        "/home/iscle/Downloads/interfaces-refs_heads_main (1)/media/aidl_api/android.media.audio.eraser.types/current/"
-#)
-#
-#set(AIDL_OUTPUT_DIR ${CMAKE_BINARY_DIR}/generated/aidl)
-#set(AIDL_HEADER_OUTPUT_DIR ${CMAKE_BINARY_DIR}/generated/aidl/include)
-#
-#file(MAKE_DIRECTORY ${AIDL_OUTPUT_DIR})
-#file(MAKE_DIRECTORY ${AIDL_HEADER_OUTPUT_DIR})
-#
-## Generate AIDL command
-#set(AIDL_GENERATED_SRC ${AIDL_OUTPUT_DIR}/android/hardware/audio/effect/IEffect.cpp)
-#set(AIDL_GENERATED_HEADER ${AIDL_HEADER_OUTPUT_DIR}/android/hardware/audio/effect/IEffect.h)
-#
-#add_custom_command(
-#        OUTPUT ${AIDL_GENERATED_SRC} ${AIDL_GENERATED_HEADER}
-#        COMMAND ${AIDL_COMPILER}
-#        --lang=ndk
-#        -o ${AIDL_OUTPUT_DIR}
-#        -h ${AIDL_HEADER_OUTPUT_DIR}
-#        --structured
-#        --stability=vintf
-#        ${AIDL_INCLUDE_DIRS_FLAGS}
-#        ${AIDL_FILE}
-#        DEPENDS ${AIDL_FILE}
-#        COMMENT "Generating AIDL C++ bindings for IEffect"
-#)
-#
-## Convert include dirs to -I flags
-#set(AIDL_INCLUDE_DIRS_FLAGS "")
-#foreach(dir ${AIDL_INCLUDE_DIRS})
-#    set(AIDL_INCLUDE_DIRS_FLAGS "${AIDL_INCLUDE_DIRS_FLAGS} -I \"${dir}\"")
-#endforeach()
-
-set(AIDL_GENERATED_SRC
-        src/generated/android/hardware/audio/effect/IEffect.cpp
-)
-
 # FFTS
 #add_subdirectory(src/viper/ffts)
 
 # ViPERFX
-include_directories(src/cpp/include)
-include_directories(src/generated/include)  # Add generated headers to include path
+include_directories(src/include)
 
 set(FILES
-        # Add generated AIDL source
-        ${AIDL_GENERATED_SRC}
-
         # Main
-        src/cpp/viper/ViPER.cpp
-        src/cpp/ViPER4Android.cpp
-        src/cpp/ViperContext.cpp
-        src/cpp/viper_aidl.cpp
+        src/viper/ViPER.cpp
+        src/ViPER4Android.cpp
+        src/ViperContext.cpp
+        src/viper_aidl.cpp
 
         # Effects
-        src/cpp/viper/effects/AnalogX.cpp
-        src/cpp/viper/effects/ColorfulMusic.cpp
-        src/cpp/viper/effects/Convolver.cpp
-        src/cpp/viper/effects/Cure.cpp
-        src/cpp/viper/effects/DiffSurround.cpp
-        src/cpp/viper/effects/DynamicSystem.cpp
-        src/cpp/viper/effects/FETCompressor.cpp
-        src/cpp/viper/effects/IIRFilter.cpp
-        src/cpp/viper/effects/PlaybackGain.cpp
-        src/cpp/viper/effects/Reverberation.cpp
-        src/cpp/viper/effects/SoftwareLimiter.cpp
-        src/cpp/viper/effects/SpeakerCorrection.cpp
-        src/cpp/viper/effects/SpectrumExtend.cpp
-        src/cpp/viper/effects/TubeSimulator.cpp
-        src/cpp/viper/effects/VHE.cpp
-        src/cpp/viper/effects/ViPERBass.cpp
-        src/cpp/viper/effects/ViPERClarity.cpp
-        src/cpp/viper/effects/ViPERDDC.cpp
+        src/viper/effects/AnalogX.cpp
+        src/viper/effects/ColorfulMusic.cpp
+        src/viper/effects/Convolver.cpp
+        src/viper/effects/Cure.cpp
+        src/viper/effects/DiffSurround.cpp
+        src/viper/effects/DynamicSystem.cpp
+        src/viper/effects/FETCompressor.cpp
+        src/viper/effects/IIRFilter.cpp
+        src/viper/effects/PlaybackGain.cpp
+        src/viper/effects/Reverberation.cpp
+        src/viper/effects/SoftwareLimiter.cpp
+        src/viper/effects/SpeakerCorrection.cpp
+        src/viper/effects/SpectrumExtend.cpp
+        src/viper/effects/TubeSimulator.cpp
+        src/viper/effects/VHE.cpp
+        src/viper/effects/ViPERBass.cpp
+        src/viper/effects/ViPERClarity.cpp
+        src/viper/effects/ViPERDDC.cpp
 
         # Utils
-        src/cpp/viper/utils/AdaptiveBuffer.cpp
-        src/cpp/viper/utils/Biquad.cpp
-        src/cpp/viper/utils/CAllpassFilter.cpp
-        src/cpp/viper/utils/CCombFilter.cpp
-        src/cpp/viper/utils/CRevModel.cpp
-        src/cpp/viper/utils/Crossfeed.cpp
-        src/cpp/viper/utils/DepthSurround.cpp
-        src/cpp/viper/utils/DynamicBass.cpp
-        src/cpp/viper/utils/FIR.cpp
-        src/cpp/viper/utils/Harmonic.cpp
-        src/cpp/viper/utils/HiFi.cpp
-        src/cpp/viper/utils/HighShelf.cpp
-        src/cpp/viper/utils/IIR_1st.cpp
-        src/cpp/viper/utils/IIR_NOrder_BW_BP.cpp
-        src/cpp/viper/utils/IIR_NOrder_BW_LH.cpp
-        src/cpp/viper/utils/MinPhaseIIRCoeffs.cpp
-        src/cpp/viper/utils/MultiBiquad.cpp
-        src/cpp/viper/utils/NoiseSharpening.cpp
-        src/cpp/viper/utils/PassFilter.cpp
-        src/cpp/viper/utils/PConvSingle.cpp
-        src/cpp/viper/utils/PolesFilter.cpp
-        src/cpp/viper/utils/Polyphase.cpp
-        src/cpp/viper/utils/Stereo3DSurround.cpp
-        src/cpp/viper/utils/Subwoofer.cpp
-        src/cpp/viper/utils/TimeConstDelay.cpp
-        src/cpp/viper/utils/WaveBuffer.cpp)
+        src/viper/utils/AdaptiveBuffer.cpp
+        src/viper/utils/Biquad.cpp
+        src/viper/utils/CAllpassFilter.cpp
+        src/viper/utils/CCombFilter.cpp
+        src/viper/utils/CRevModel.cpp
+        src/viper/utils/Crossfeed.cpp
+        src/viper/utils/DepthSurround.cpp
+        src/viper/utils/DynamicBass.cpp
+        src/viper/utils/FIR.cpp
+        src/viper/utils/Harmonic.cpp
+        src/viper/utils/HiFi.cpp
+        src/viper/utils/HighShelf.cpp
+        src/viper/utils/IIR_1st.cpp
+        src/viper/utils/IIR_NOrder_BW_BP.cpp
+        src/viper/utils/IIR_NOrder_BW_LH.cpp
+        src/viper/utils/MinPhaseIIRCoeffs.cpp
+        src/viper/utils/MultiBiquad.cpp
+        src/viper/utils/NoiseSharpening.cpp
+        src/viper/utils/PassFilter.cpp
+        src/viper/utils/PConvSingle.cpp
+        src/viper/utils/PolesFilter.cpp
+        src/viper/utils/Polyphase.cpp
+        src/viper/utils/Stereo3DSurround.cpp
+        src/viper/utils/Subwoofer.cpp
+        src/viper/utils/TimeConstDelay.cpp
+        src/viper/utils/WaveBuffer.cpp)
 
 add_library(
         # Sets the name of the library.
diff --git a/src/external/hardware_interfaces b/external/hardware_interfaces
similarity index 100%
rename from src/external/hardware_interfaces
rename to external/hardware_interfaces
diff --git a/src/external/system_hardware_interfaces b/external/system_hardware_interfaces
similarity index 100%
rename from src/external/system_hardware_interfaces
rename to external/system_hardware_interfaces
diff --git a/src/cpp/ViPER4Android.cpp b/src/ViPER4Android.cpp
similarity index 100%
rename from src/cpp/ViPER4Android.cpp
rename to src/ViPER4Android.cpp
diff --git a/src/cpp/ViPER4Android.h b/src/ViPER4Android.h
similarity index 100%
rename from src/cpp/ViPER4Android.h
rename to src/ViPER4Android.h
diff --git a/src/cpp/ViperContext.cpp b/src/ViperContext.cpp
similarity index 100%
rename from src/cpp/ViperContext.cpp
rename to src/ViperContext.cpp
diff --git a/src/cpp/ViperContext.h b/src/ViperContext.h
similarity index 100%
rename from src/cpp/ViperContext.h
rename to src/ViperContext.h
diff --git a/src/cpp/include/essential.h b/src/include/essential.h
similarity index 100%
rename from src/cpp/include/essential.h
rename to src/include/essential.h
diff --git a/src/cpp/log.h b/src/log.h
similarity index 100%
rename from src/cpp/log.h
rename to src/log.h
diff --git a/src/cpp/viper/ViPER.cpp b/src/viper/ViPER.cpp
similarity index 100%
rename from src/cpp/viper/ViPER.cpp
rename to src/viper/ViPER.cpp
diff --git a/src/cpp/viper/ViPER.h b/src/viper/ViPER.h
similarity index 100%
rename from src/cpp/viper/ViPER.h
rename to src/viper/ViPER.h
diff --git a/src/cpp/viper/constants.h b/src/viper/constants.h
similarity index 100%
rename from src/cpp/viper/constants.h
rename to src/viper/constants.h
diff --git a/src/cpp/viper/effects/AnalogX.cpp b/src/viper/effects/AnalogX.cpp
similarity index 100%
rename from src/cpp/viper/effects/AnalogX.cpp
rename to src/viper/effects/AnalogX.cpp
diff --git a/src/cpp/viper/effects/AnalogX.h b/src/viper/effects/AnalogX.h
similarity index 100%
rename from src/cpp/viper/effects/AnalogX.h
rename to src/viper/effects/AnalogX.h
diff --git a/src/cpp/viper/effects/ColorfulMusic.cpp b/src/viper/effects/ColorfulMusic.cpp
similarity index 100%
rename from src/cpp/viper/effects/ColorfulMusic.cpp
rename to src/viper/effects/ColorfulMusic.cpp
diff --git a/src/cpp/viper/effects/ColorfulMusic.h b/src/viper/effects/ColorfulMusic.h
similarity index 100%
rename from src/cpp/viper/effects/ColorfulMusic.h
rename to src/viper/effects/ColorfulMusic.h
diff --git a/src/cpp/viper/effects/Convolver.cpp b/src/viper/effects/Convolver.cpp
similarity index 100%
rename from src/cpp/viper/effects/Convolver.cpp
rename to src/viper/effects/Convolver.cpp
diff --git a/src/cpp/viper/effects/Convolver.h b/src/viper/effects/Convolver.h
similarity index 100%
rename from src/cpp/viper/effects/Convolver.h
rename to src/viper/effects/Convolver.h
diff --git a/src/cpp/viper/effects/Cure.cpp b/src/viper/effects/Cure.cpp
similarity index 100%
rename from src/cpp/viper/effects/Cure.cpp
rename to src/viper/effects/Cure.cpp
diff --git a/src/cpp/viper/effects/Cure.h b/src/viper/effects/Cure.h
similarity index 100%
rename from src/cpp/viper/effects/Cure.h
rename to src/viper/effects/Cure.h
diff --git a/src/cpp/viper/effects/DiffSurround.cpp b/src/viper/effects/DiffSurround.cpp
similarity index 100%
rename from src/cpp/viper/effects/DiffSurround.cpp
rename to src/viper/effects/DiffSurround.cpp
diff --git a/src/cpp/viper/effects/DiffSurround.h b/src/viper/effects/DiffSurround.h
similarity index 100%
rename from src/cpp/viper/effects/DiffSurround.h
rename to src/viper/effects/DiffSurround.h
diff --git a/src/cpp/viper/effects/DynamicSystem.cpp b/src/viper/effects/DynamicSystem.cpp
similarity index 100%
rename from src/cpp/viper/effects/DynamicSystem.cpp
rename to src/viper/effects/DynamicSystem.cpp
diff --git a/src/cpp/viper/effects/DynamicSystem.h b/src/viper/effects/DynamicSystem.h
similarity index 100%
rename from src/cpp/viper/effects/DynamicSystem.h
rename to src/viper/effects/DynamicSystem.h
diff --git a/src/cpp/viper/effects/FETCompressor.cpp b/src/viper/effects/FETCompressor.cpp
similarity index 100%
rename from src/cpp/viper/effects/FETCompressor.cpp
rename to src/viper/effects/FETCompressor.cpp
diff --git a/src/cpp/viper/effects/FETCompressor.h b/src/viper/effects/FETCompressor.h
similarity index 100%
rename from src/cpp/viper/effects/FETCompressor.h
rename to src/viper/effects/FETCompressor.h
diff --git a/src/cpp/viper/effects/IIRFilter.cpp b/src/viper/effects/IIRFilter.cpp
similarity index 100%
rename from src/cpp/viper/effects/IIRFilter.cpp
rename to src/viper/effects/IIRFilter.cpp
diff --git a/src/cpp/viper/effects/IIRFilter.h b/src/viper/effects/IIRFilter.h
similarity index 100%
rename from src/cpp/viper/effects/IIRFilter.h
rename to src/viper/effects/IIRFilter.h
diff --git a/src/cpp/viper/effects/PlaybackGain.cpp b/src/viper/effects/PlaybackGain.cpp
similarity index 100%
rename from src/cpp/viper/effects/PlaybackGain.cpp
rename to src/viper/effects/PlaybackGain.cpp
diff --git a/src/cpp/viper/effects/PlaybackGain.h b/src/viper/effects/PlaybackGain.h
similarity index 100%
rename from src/cpp/viper/effects/PlaybackGain.h
rename to src/viper/effects/PlaybackGain.h
diff --git a/src/cpp/viper/effects/Reverberation.cpp b/src/viper/effects/Reverberation.cpp
similarity index 100%
rename from src/cpp/viper/effects/Reverberation.cpp
rename to src/viper/effects/Reverberation.cpp
diff --git a/src/cpp/viper/effects/Reverberation.h b/src/viper/effects/Reverberation.h
similarity index 100%
rename from src/cpp/viper/effects/Reverberation.h
rename to src/viper/effects/Reverberation.h
diff --git a/src/cpp/viper/effects/SoftwareLimiter.cpp b/src/viper/effects/SoftwareLimiter.cpp
similarity index 100%
rename from src/cpp/viper/effects/SoftwareLimiter.cpp
rename to src/viper/effects/SoftwareLimiter.cpp
diff --git a/src/cpp/viper/effects/SoftwareLimiter.h b/src/viper/effects/SoftwareLimiter.h
similarity index 100%
rename from src/cpp/viper/effects/SoftwareLimiter.h
rename to src/viper/effects/SoftwareLimiter.h
diff --git a/src/cpp/viper/effects/SpeakerCorrection.cpp b/src/viper/effects/SpeakerCorrection.cpp
similarity index 100%
rename from src/cpp/viper/effects/SpeakerCorrection.cpp
rename to src/viper/effects/SpeakerCorrection.cpp
diff --git a/src/cpp/viper/effects/SpeakerCorrection.h b/src/viper/effects/SpeakerCorrection.h
similarity index 100%
rename from src/cpp/viper/effects/SpeakerCorrection.h
rename to src/viper/effects/SpeakerCorrection.h
diff --git a/src/cpp/viper/effects/SpectrumExtend.cpp b/src/viper/effects/SpectrumExtend.cpp
similarity index 100%
rename from src/cpp/viper/effects/SpectrumExtend.cpp
rename to src/viper/effects/SpectrumExtend.cpp
diff --git a/src/cpp/viper/effects/SpectrumExtend.h b/src/viper/effects/SpectrumExtend.h
similarity index 100%
rename from src/cpp/viper/effects/SpectrumExtend.h
rename to src/viper/effects/SpectrumExtend.h
diff --git a/src/cpp/viper/effects/TubeSimulator.cpp b/src/viper/effects/TubeSimulator.cpp
similarity index 100%
rename from src/cpp/viper/effects/TubeSimulator.cpp
rename to src/viper/effects/TubeSimulator.cpp
diff --git a/src/cpp/viper/effects/TubeSimulator.h b/src/viper/effects/TubeSimulator.h
similarity index 100%
rename from src/cpp/viper/effects/TubeSimulator.h
rename to src/viper/effects/TubeSimulator.h
diff --git a/src/cpp/viper/effects/VHE.cpp b/src/viper/effects/VHE.cpp
similarity index 100%
rename from src/cpp/viper/effects/VHE.cpp
rename to src/viper/effects/VHE.cpp
diff --git a/src/cpp/viper/effects/VHE.h b/src/viper/effects/VHE.h
similarity index 100%
rename from src/cpp/viper/effects/VHE.h
rename to src/viper/effects/VHE.h
diff --git a/src/cpp/viper/effects/VHE_L0.h b/src/viper/effects/VHE_L0.h
similarity index 100%
rename from src/cpp/viper/effects/VHE_L0.h
rename to src/viper/effects/VHE_L0.h
diff --git a/src/cpp/viper/effects/VHE_L1.h b/src/viper/effects/VHE_L1.h
similarity index 100%
rename from src/cpp/viper/effects/VHE_L1.h
rename to src/viper/effects/VHE_L1.h
diff --git a/src/cpp/viper/effects/VHE_L2.h b/src/viper/effects/VHE_L2.h
similarity index 100%
rename from src/cpp/viper/effects/VHE_L2.h
rename to src/viper/effects/VHE_L2.h
diff --git a/src/cpp/viper/effects/VHE_L3.h b/src/viper/effects/VHE_L3.h
similarity index 100%
rename from src/cpp/viper/effects/VHE_L3.h
rename to src/viper/effects/VHE_L3.h
diff --git a/src/cpp/viper/effects/VHE_L4.h b/src/viper/effects/VHE_L4.h
similarity index 100%
rename from src/cpp/viper/effects/VHE_L4.h
rename to src/viper/effects/VHE_L4.h
diff --git a/src/cpp/viper/effects/ViPERBass.cpp b/src/viper/effects/ViPERBass.cpp
similarity index 100%
rename from src/cpp/viper/effects/ViPERBass.cpp
rename to src/viper/effects/ViPERBass.cpp
diff --git a/src/cpp/viper/effects/ViPERBass.h b/src/viper/effects/ViPERBass.h
similarity index 100%
rename from src/cpp/viper/effects/ViPERBass.h
rename to src/viper/effects/ViPERBass.h
diff --git a/src/cpp/viper/effects/ViPERClarity.cpp b/src/viper/effects/ViPERClarity.cpp
similarity index 100%
rename from src/cpp/viper/effects/ViPERClarity.cpp
rename to src/viper/effects/ViPERClarity.cpp
diff --git a/src/cpp/viper/effects/ViPERClarity.h b/src/viper/effects/ViPERClarity.h
similarity index 100%
rename from src/cpp/viper/effects/ViPERClarity.h
rename to src/viper/effects/ViPERClarity.h
diff --git a/src/cpp/viper/effects/ViPERDDC.cpp b/src/viper/effects/ViPERDDC.cpp
similarity index 100%
rename from src/cpp/viper/effects/ViPERDDC.cpp
rename to src/viper/effects/ViPERDDC.cpp
diff --git a/src/cpp/viper/effects/ViPERDDC.h b/src/viper/effects/ViPERDDC.h
similarity index 100%
rename from src/cpp/viper/effects/ViPERDDC.h
rename to src/viper/effects/ViPERDDC.h
diff --git a/src/cpp/viper/utils/AdaptiveBuffer.cpp b/src/viper/utils/AdaptiveBuffer.cpp
similarity index 100%
rename from src/cpp/viper/utils/AdaptiveBuffer.cpp
rename to src/viper/utils/AdaptiveBuffer.cpp
diff --git a/src/cpp/viper/utils/AdaptiveBuffer.h b/src/viper/utils/AdaptiveBuffer.h
similarity index 100%
rename from src/cpp/viper/utils/AdaptiveBuffer.h
rename to src/viper/utils/AdaptiveBuffer.h
diff --git a/src/cpp/viper/utils/Biquad.cpp b/src/viper/utils/Biquad.cpp
similarity index 100%
rename from src/cpp/viper/utils/Biquad.cpp
rename to src/viper/utils/Biquad.cpp
diff --git a/src/cpp/viper/utils/Biquad.h b/src/viper/utils/Biquad.h
similarity index 100%
rename from src/cpp/viper/utils/Biquad.h
rename to src/viper/utils/Biquad.h
diff --git a/src/cpp/viper/utils/CAllpassFilter.cpp b/src/viper/utils/CAllpassFilter.cpp
similarity index 100%
rename from src/cpp/viper/utils/CAllpassFilter.cpp
rename to src/viper/utils/CAllpassFilter.cpp
diff --git a/src/cpp/viper/utils/CAllpassFilter.h b/src/viper/utils/CAllpassFilter.h
similarity index 100%
rename from src/cpp/viper/utils/CAllpassFilter.h
rename to src/viper/utils/CAllpassFilter.h
diff --git a/src/cpp/viper/utils/CCombFilter.cpp b/src/viper/utils/CCombFilter.cpp
similarity index 100%
rename from src/cpp/viper/utils/CCombFilter.cpp
rename to src/viper/utils/CCombFilter.cpp
diff --git a/src/cpp/viper/utils/CCombFilter.h b/src/viper/utils/CCombFilter.h
similarity index 100%
rename from src/cpp/viper/utils/CCombFilter.h
rename to src/viper/utils/CCombFilter.h
diff --git a/src/cpp/viper/utils/CRevModel.cpp b/src/viper/utils/CRevModel.cpp
similarity index 100%
rename from src/cpp/viper/utils/CRevModel.cpp
rename to src/viper/utils/CRevModel.cpp
diff --git a/src/cpp/viper/utils/CRevModel.h b/src/viper/utils/CRevModel.h
similarity index 100%
rename from src/cpp/viper/utils/CRevModel.h
rename to src/viper/utils/CRevModel.h
diff --git a/src/cpp/viper/utils/Crossfeed.cpp b/src/viper/utils/Crossfeed.cpp
similarity index 100%
rename from src/cpp/viper/utils/Crossfeed.cpp
rename to src/viper/utils/Crossfeed.cpp
diff --git a/src/cpp/viper/utils/Crossfeed.h b/src/viper/utils/Crossfeed.h
similarity index 100%
rename from src/cpp/viper/utils/Crossfeed.h
rename to src/viper/utils/Crossfeed.h
diff --git a/src/cpp/viper/utils/DepthSurround.cpp b/src/viper/utils/DepthSurround.cpp
similarity index 100%
rename from src/cpp/viper/utils/DepthSurround.cpp
rename to src/viper/utils/DepthSurround.cpp
diff --git a/src/cpp/viper/utils/DepthSurround.h b/src/viper/utils/DepthSurround.h
similarity index 100%
rename from src/cpp/viper/utils/DepthSurround.h
rename to src/viper/utils/DepthSurround.h
diff --git a/src/cpp/viper/utils/DynamicBass.cpp b/src/viper/utils/DynamicBass.cpp
similarity index 100%
rename from src/cpp/viper/utils/DynamicBass.cpp
rename to src/viper/utils/DynamicBass.cpp
diff --git a/src/cpp/viper/utils/DynamicBass.h b/src/viper/utils/DynamicBass.h
similarity index 100%
rename from src/cpp/viper/utils/DynamicBass.h
rename to src/viper/utils/DynamicBass.h
diff --git a/src/cpp/viper/utils/FIR.cpp b/src/viper/utils/FIR.cpp
similarity index 100%
rename from src/cpp/viper/utils/FIR.cpp
rename to src/viper/utils/FIR.cpp
diff --git a/src/cpp/viper/utils/FIR.h b/src/viper/utils/FIR.h
similarity index 100%
rename from src/cpp/viper/utils/FIR.h
rename to src/viper/utils/FIR.h
diff --git a/src/cpp/viper/utils/Harmonic.cpp b/src/viper/utils/Harmonic.cpp
similarity index 100%
rename from src/cpp/viper/utils/Harmonic.cpp
rename to src/viper/utils/Harmonic.cpp
diff --git a/src/cpp/viper/utils/Harmonic.h b/src/viper/utils/Harmonic.h
similarity index 100%
rename from src/cpp/viper/utils/Harmonic.h
rename to src/viper/utils/Harmonic.h
diff --git a/src/cpp/viper/utils/HiFi.cpp b/src/viper/utils/HiFi.cpp
similarity index 100%
rename from src/cpp/viper/utils/HiFi.cpp
rename to src/viper/utils/HiFi.cpp
diff --git a/src/cpp/viper/utils/HiFi.h b/src/viper/utils/HiFi.h
similarity index 100%
rename from src/cpp/viper/utils/HiFi.h
rename to src/viper/utils/HiFi.h
diff --git a/src/cpp/viper/utils/HighShelf.cpp b/src/viper/utils/HighShelf.cpp
similarity index 100%
rename from src/cpp/viper/utils/HighShelf.cpp
rename to src/viper/utils/HighShelf.cpp
diff --git a/src/cpp/viper/utils/HighShelf.h b/src/viper/utils/HighShelf.h
similarity index 100%
rename from src/cpp/viper/utils/HighShelf.h
rename to src/viper/utils/HighShelf.h
diff --git a/src/cpp/viper/utils/IIR_1st.cpp b/src/viper/utils/IIR_1st.cpp
similarity index 100%
rename from src/cpp/viper/utils/IIR_1st.cpp
rename to src/viper/utils/IIR_1st.cpp
diff --git a/src/cpp/viper/utils/IIR_1st.h b/src/viper/utils/IIR_1st.h
similarity index 100%
rename from src/cpp/viper/utils/IIR_1st.h
rename to src/viper/utils/IIR_1st.h
diff --git a/src/cpp/viper/utils/IIR_NOrder_BW_BP.cpp b/src/viper/utils/IIR_NOrder_BW_BP.cpp
similarity index 100%
rename from src/cpp/viper/utils/IIR_NOrder_BW_BP.cpp
rename to src/viper/utils/IIR_NOrder_BW_BP.cpp
diff --git a/src/cpp/viper/utils/IIR_NOrder_BW_BP.h b/src/viper/utils/IIR_NOrder_BW_BP.h
similarity index 100%
rename from src/cpp/viper/utils/IIR_NOrder_BW_BP.h
rename to src/viper/utils/IIR_NOrder_BW_BP.h
diff --git a/src/cpp/viper/utils/IIR_NOrder_BW_LH.cpp b/src/viper/utils/IIR_NOrder_BW_LH.cpp
similarity index 100%
rename from src/cpp/viper/utils/IIR_NOrder_BW_LH.cpp
rename to src/viper/utils/IIR_NOrder_BW_LH.cpp
diff --git a/src/cpp/viper/utils/IIR_NOrder_BW_LH.h b/src/viper/utils/IIR_NOrder_BW_LH.h
similarity index 100%
rename from src/cpp/viper/utils/IIR_NOrder_BW_LH.h
rename to src/viper/utils/IIR_NOrder_BW_LH.h
diff --git a/src/cpp/viper/utils/MinPhaseIIRCoeffs.cpp b/src/viper/utils/MinPhaseIIRCoeffs.cpp
similarity index 100%
rename from src/cpp/viper/utils/MinPhaseIIRCoeffs.cpp
rename to src/viper/utils/MinPhaseIIRCoeffs.cpp
diff --git a/src/cpp/viper/utils/MinPhaseIIRCoeffs.h b/src/viper/utils/MinPhaseIIRCoeffs.h
similarity index 100%
rename from src/cpp/viper/utils/MinPhaseIIRCoeffs.h
rename to src/viper/utils/MinPhaseIIRCoeffs.h
diff --git a/src/cpp/viper/utils/MultiBiquad.cpp b/src/viper/utils/MultiBiquad.cpp
similarity index 100%
rename from src/cpp/viper/utils/MultiBiquad.cpp
rename to src/viper/utils/MultiBiquad.cpp
diff --git a/src/cpp/viper/utils/MultiBiquad.h b/src/viper/utils/MultiBiquad.h
similarity index 100%
rename from src/cpp/viper/utils/MultiBiquad.h
rename to src/viper/utils/MultiBiquad.h
diff --git a/src/cpp/viper/utils/NoiseSharpening.cpp b/src/viper/utils/NoiseSharpening.cpp
similarity index 100%
rename from src/cpp/viper/utils/NoiseSharpening.cpp
rename to src/viper/utils/NoiseSharpening.cpp
diff --git a/src/cpp/viper/utils/NoiseSharpening.h b/src/viper/utils/NoiseSharpening.h
similarity index 100%
rename from src/cpp/viper/utils/NoiseSharpening.h
rename to src/viper/utils/NoiseSharpening.h
diff --git a/src/cpp/viper/utils/PConvSingle.cpp b/src/viper/utils/PConvSingle.cpp
similarity index 100%
rename from src/cpp/viper/utils/PConvSingle.cpp
rename to src/viper/utils/PConvSingle.cpp
diff --git a/src/cpp/viper/utils/PConvSingle.h b/src/viper/utils/PConvSingle.h
similarity index 100%
rename from src/cpp/viper/utils/PConvSingle.h
rename to src/viper/utils/PConvSingle.h
diff --git a/src/cpp/viper/utils/PassFilter.cpp b/src/viper/utils/PassFilter.cpp
similarity index 100%
rename from src/cpp/viper/utils/PassFilter.cpp
rename to src/viper/utils/PassFilter.cpp
diff --git a/src/cpp/viper/utils/PassFilter.h b/src/viper/utils/PassFilter.h
similarity index 100%
rename from src/cpp/viper/utils/PassFilter.h
rename to src/viper/utils/PassFilter.h
diff --git a/src/cpp/viper/utils/PolesFilter.cpp b/src/viper/utils/PolesFilter.cpp
similarity index 100%
rename from src/cpp/viper/utils/PolesFilter.cpp
rename to src/viper/utils/PolesFilter.cpp
diff --git a/src/cpp/viper/utils/PolesFilter.h b/src/viper/utils/PolesFilter.h
similarity index 100%
rename from src/cpp/viper/utils/PolesFilter.h
rename to src/viper/utils/PolesFilter.h
diff --git a/src/cpp/viper/utils/Polyphase.cpp b/src/viper/utils/Polyphase.cpp
similarity index 100%
rename from src/cpp/viper/utils/Polyphase.cpp
rename to src/viper/utils/Polyphase.cpp
diff --git a/src/cpp/viper/utils/Polyphase.h b/src/viper/utils/Polyphase.h
similarity index 100%
rename from src/cpp/viper/utils/Polyphase.h
rename to src/viper/utils/Polyphase.h
diff --git a/src/cpp/viper/utils/Stereo3DSurround.cpp b/src/viper/utils/Stereo3DSurround.cpp
similarity index 100%
rename from src/cpp/viper/utils/Stereo3DSurround.cpp
rename to src/viper/utils/Stereo3DSurround.cpp
diff --git a/src/cpp/viper/utils/Stereo3DSurround.h b/src/viper/utils/Stereo3DSurround.h
similarity index 100%
rename from src/cpp/viper/utils/Stereo3DSurround.h
rename to src/viper/utils/Stereo3DSurround.h
diff --git a/src/cpp/viper/utils/Subwoofer.cpp b/src/viper/utils/Subwoofer.cpp
similarity index 100%
rename from src/cpp/viper/utils/Subwoofer.cpp
rename to src/viper/utils/Subwoofer.cpp
diff --git a/src/cpp/viper/utils/Subwoofer.h b/src/viper/utils/Subwoofer.h
similarity index 100%
rename from src/cpp/viper/utils/Subwoofer.h
rename to src/viper/utils/Subwoofer.h
diff --git a/src/cpp/viper/utils/TimeConstDelay.cpp b/src/viper/utils/TimeConstDelay.cpp
similarity index 100%
rename from src/cpp/viper/utils/TimeConstDelay.cpp
rename to src/viper/utils/TimeConstDelay.cpp
diff --git a/src/cpp/viper/utils/TimeConstDelay.h b/src/viper/utils/TimeConstDelay.h
similarity index 100%
rename from src/cpp/viper/utils/TimeConstDelay.h
rename to src/viper/utils/TimeConstDelay.h
diff --git a/src/cpp/viper/utils/WaveBuffer.cpp b/src/viper/utils/WaveBuffer.cpp
similarity index 100%
rename from src/cpp/viper/utils/WaveBuffer.cpp
rename to src/viper/utils/WaveBuffer.cpp
diff --git a/src/cpp/viper/utils/WaveBuffer.h b/src/viper/utils/WaveBuffer.h
similarity index 100%
rename from src/cpp/viper/utils/WaveBuffer.h
rename to src/viper/utils/WaveBuffer.h
diff --git a/src/cpp/viper_aidl.cpp b/src/viper_aidl.cpp
similarity index 100%
rename from src/cpp/viper_aidl.cpp
rename to src/viper_aidl.cpp
diff --git a/src/cpp/viper_aidl.h b/src/viper_aidl.h
similarity index 100%
rename from src/cpp/viper_aidl.h
rename to src/viper_aidl.h