diff --git a/audio/2.0/default/Android.mk b/audio/common/all-versions/default/service/Android.mk
similarity index 100%
rename from audio/2.0/default/Android.mk
rename to audio/common/all-versions/default/service/Android.mk
diff --git a/audio/2.0/default/android.hardware.audio@2.0-service.rc b/audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc
similarity index 100%
rename from audio/2.0/default/android.hardware.audio@2.0-service.rc
rename to audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc
diff --git a/audio/2.0/default/service.cpp b/audio/common/all-versions/default/service/service.cpp
similarity index 100%
rename from audio/2.0/default/service.cpp
rename to audio/common/all-versions/default/service/service.cpp