diff --git a/audio/effect/2.0/default/AcousticEchoCancelerEffect.cpp b/audio/effect/all-versions/AcousticEchoCancelerEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/AcousticEchoCancelerEffect.cpp
rename to audio/effect/all-versions/AcousticEchoCancelerEffect.cpp
diff --git a/audio/effect/2.0/default/AcousticEchoCancelerEffect.h b/audio/effect/all-versions/AcousticEchoCancelerEffect.h
similarity index 100%
rename from audio/effect/2.0/default/AcousticEchoCancelerEffect.h
rename to audio/effect/all-versions/AcousticEchoCancelerEffect.h
diff --git a/audio/effect/2.0/default/Android.bp b/audio/effect/all-versions/Android.bp
similarity index 100%
rename from audio/effect/2.0/default/Android.bp
rename to audio/effect/all-versions/Android.bp
diff --git a/audio/effect/2.0/default/AudioBufferManager.cpp b/audio/effect/all-versions/AudioBufferManager.cpp
similarity index 100%
rename from audio/effect/2.0/default/AudioBufferManager.cpp
rename to audio/effect/all-versions/AudioBufferManager.cpp
diff --git a/audio/effect/2.0/default/AudioBufferManager.h b/audio/effect/all-versions/AudioBufferManager.h
similarity index 100%
rename from audio/effect/2.0/default/AudioBufferManager.h
rename to audio/effect/all-versions/AudioBufferManager.h
diff --git a/audio/effect/2.0/default/AutomaticGainControlEffect.cpp b/audio/effect/all-versions/AutomaticGainControlEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/AutomaticGainControlEffect.cpp
rename to audio/effect/all-versions/AutomaticGainControlEffect.cpp
diff --git a/audio/effect/2.0/default/AutomaticGainControlEffect.h b/audio/effect/all-versions/AutomaticGainControlEffect.h
similarity index 100%
rename from audio/effect/2.0/default/AutomaticGainControlEffect.h
rename to audio/effect/all-versions/AutomaticGainControlEffect.h
diff --git a/audio/effect/2.0/default/BassBoostEffect.cpp b/audio/effect/all-versions/BassBoostEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/BassBoostEffect.cpp
rename to audio/effect/all-versions/BassBoostEffect.cpp
diff --git a/audio/effect/2.0/default/BassBoostEffect.h b/audio/effect/all-versions/BassBoostEffect.h
similarity index 100%
rename from audio/effect/2.0/default/BassBoostEffect.h
rename to audio/effect/all-versions/BassBoostEffect.h
diff --git a/audio/effect/2.0/default/Conversions.cpp b/audio/effect/all-versions/Conversions.cpp
similarity index 100%
rename from audio/effect/2.0/default/Conversions.cpp
rename to audio/effect/all-versions/Conversions.cpp
diff --git a/audio/effect/2.0/default/Conversions.h b/audio/effect/all-versions/Conversions.h
similarity index 100%
rename from audio/effect/2.0/default/Conversions.h
rename to audio/effect/all-versions/Conversions.h
diff --git a/audio/effect/2.0/default/DownmixEffect.cpp b/audio/effect/all-versions/DownmixEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/DownmixEffect.cpp
rename to audio/effect/all-versions/DownmixEffect.cpp
diff --git a/audio/effect/2.0/default/DownmixEffect.h b/audio/effect/all-versions/DownmixEffect.h
similarity index 100%
rename from audio/effect/2.0/default/DownmixEffect.h
rename to audio/effect/all-versions/DownmixEffect.h
diff --git a/audio/effect/2.0/default/Effect.cpp b/audio/effect/all-versions/Effect.cpp
similarity index 100%
rename from audio/effect/2.0/default/Effect.cpp
rename to audio/effect/all-versions/Effect.cpp
diff --git a/audio/effect/2.0/default/Effect.h b/audio/effect/all-versions/Effect.h
similarity index 100%
rename from audio/effect/2.0/default/Effect.h
rename to audio/effect/all-versions/Effect.h
diff --git a/audio/effect/2.0/default/EffectsFactory.cpp b/audio/effect/all-versions/EffectsFactory.cpp
similarity index 100%
rename from audio/effect/2.0/default/EffectsFactory.cpp
rename to audio/effect/all-versions/EffectsFactory.cpp
diff --git a/audio/effect/2.0/default/EffectsFactory.h b/audio/effect/all-versions/EffectsFactory.h
similarity index 100%
rename from audio/effect/2.0/default/EffectsFactory.h
rename to audio/effect/all-versions/EffectsFactory.h
diff --git a/audio/effect/2.0/default/EnvironmentalReverbEffect.cpp b/audio/effect/all-versions/EnvironmentalReverbEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/EnvironmentalReverbEffect.cpp
rename to audio/effect/all-versions/EnvironmentalReverbEffect.cpp
diff --git a/audio/effect/2.0/default/EnvironmentalReverbEffect.h b/audio/effect/all-versions/EnvironmentalReverbEffect.h
similarity index 100%
rename from audio/effect/2.0/default/EnvironmentalReverbEffect.h
rename to audio/effect/all-versions/EnvironmentalReverbEffect.h
diff --git a/audio/effect/2.0/default/EqualizerEffect.cpp b/audio/effect/all-versions/EqualizerEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/EqualizerEffect.cpp
rename to audio/effect/all-versions/EqualizerEffect.cpp
diff --git a/audio/effect/2.0/default/EqualizerEffect.h b/audio/effect/all-versions/EqualizerEffect.h
similarity index 100%
rename from audio/effect/2.0/default/EqualizerEffect.h
rename to audio/effect/all-versions/EqualizerEffect.h
diff --git a/audio/effect/2.0/default/LoudnessEnhancerEffect.cpp b/audio/effect/all-versions/LoudnessEnhancerEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/LoudnessEnhancerEffect.cpp
rename to audio/effect/all-versions/LoudnessEnhancerEffect.cpp
diff --git a/audio/effect/2.0/default/LoudnessEnhancerEffect.h b/audio/effect/all-versions/LoudnessEnhancerEffect.h
similarity index 100%
rename from audio/effect/2.0/default/LoudnessEnhancerEffect.h
rename to audio/effect/all-versions/LoudnessEnhancerEffect.h
diff --git a/audio/effect/2.0/default/NoiseSuppressionEffect.cpp b/audio/effect/all-versions/NoiseSuppressionEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/NoiseSuppressionEffect.cpp
rename to audio/effect/all-versions/NoiseSuppressionEffect.cpp
diff --git a/audio/effect/2.0/default/NoiseSuppressionEffect.h b/audio/effect/all-versions/NoiseSuppressionEffect.h
similarity index 100%
rename from audio/effect/2.0/default/NoiseSuppressionEffect.h
rename to audio/effect/all-versions/NoiseSuppressionEffect.h
diff --git a/audio/effect/all-versions/OWNERS b/audio/effect/all-versions/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/audio/effect/all-versions/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/audio/effect/2.0/default/PresetReverbEffect.cpp b/audio/effect/all-versions/PresetReverbEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/PresetReverbEffect.cpp
rename to audio/effect/all-versions/PresetReverbEffect.cpp
diff --git a/audio/effect/2.0/default/PresetReverbEffect.h b/audio/effect/all-versions/PresetReverbEffect.h
similarity index 100%
rename from audio/effect/2.0/default/PresetReverbEffect.h
rename to audio/effect/all-versions/PresetReverbEffect.h
diff --git a/audio/effect/2.0/default/VirtualizerEffect.cpp b/audio/effect/all-versions/VirtualizerEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/VirtualizerEffect.cpp
rename to audio/effect/all-versions/VirtualizerEffect.cpp
diff --git a/audio/effect/2.0/default/VirtualizerEffect.h b/audio/effect/all-versions/VirtualizerEffect.h
similarity index 100%
rename from audio/effect/2.0/default/VirtualizerEffect.h
rename to audio/effect/all-versions/VirtualizerEffect.h
diff --git a/audio/effect/2.0/default/VisualizerEffect.cpp b/audio/effect/all-versions/VisualizerEffect.cpp
similarity index 100%
rename from audio/effect/2.0/default/VisualizerEffect.cpp
rename to audio/effect/all-versions/VisualizerEffect.cpp
diff --git a/audio/effect/2.0/default/VisualizerEffect.h b/audio/effect/all-versions/VisualizerEffect.h
similarity index 100%
rename from audio/effect/2.0/default/VisualizerEffect.h
rename to audio/effect/all-versions/VisualizerEffect.h