diff --git a/audio/common/README b/audio/common/README
new file mode 100644
index 0000000..88cea46
--- /dev/null
+++ b/audio/common/README
@@ -0,0 +1 @@
+This folder contains code common to audio device and effect API
diff --git a/audio/common/all-versions/README b/audio/common/all-versions/README
new file mode 100644
index 0000000..d8df022
--- /dev/null
+++ b/audio/common/all-versions/README
@@ -0,0 +1 @@
+This folder contains code common to all versions of the audio API
diff --git a/audio/common/2.0/default/Android.bp b/audio/common/all-versions/default/Android.bp
similarity index 100%
rename from audio/common/2.0/default/Android.bp
rename to audio/common/all-versions/default/Android.bp
diff --git a/audio/common/2.0/default/EffectMap.cpp b/audio/common/all-versions/default/EffectMap.cpp
similarity index 100%
rename from audio/common/2.0/default/EffectMap.cpp
rename to audio/common/all-versions/default/EffectMap.cpp
diff --git a/audio/common/2.0/default/EffectMap.h b/audio/common/all-versions/default/EffectMap.h
similarity index 100%
rename from audio/common/2.0/default/EffectMap.h
rename to audio/common/all-versions/default/EffectMap.h
diff --git a/audio/common/2.0/default/HidlUtils.cpp b/audio/common/all-versions/default/HidlUtils.cpp
similarity index 100%
rename from audio/common/2.0/default/HidlUtils.cpp
rename to audio/common/all-versions/default/HidlUtils.cpp
diff --git a/audio/common/2.0/default/HidlUtils.h b/audio/common/all-versions/default/HidlUtils.h
similarity index 100%
rename from audio/common/2.0/default/HidlUtils.h
rename to audio/common/all-versions/default/HidlUtils.h
diff --git a/audio/common/2.0/default/OWNERS b/audio/common/all-versions/default/OWNERS
similarity index 100%
rename from audio/common/2.0/default/OWNERS
rename to audio/common/all-versions/default/OWNERS