diff --git a/audio/README b/audio/README
index b40bad0..2b81450 100644
--- a/audio/README
+++ b/audio/README
@@ -1,36 +1,36 @@
 Directory structure of the audio HIDL related code.
 
 audio
-|-- 2.0              <== legacy 2.0 device HIDL (.hal) can not be moved to fit
+|-- 2.0              <== legacy 2.0 core HIDL (.hal) can not be moved to fit
 |                        the directory structure because already published
 |
-|-- common           <== code common to audio device and effect API
+|-- common           <== code common to audio core and effect API
 |   |-- 2.0
 |   |   |-- default  <== code that wraps the legacy API
-|   |   `-- vts      <== vts of 2.0 device and effect API common code
+|   |   `-- vts      <== vts of 2.0 core and effect API common code
 |   |-- 4.0
 |   |   |-- default
 |   |   `-- vts
 |   |-- ...          <== The future versions should continue this structure
 |   |   |-- default
 |   |   `-- vts
-|   `-- all_versions <== code common to all version of both device and effect API
+|   `-- all_versions <== code common to all version of both core and effect API
 |       |-- default
-|       `-- vts      <== vts of device and effect API common version independent code
+|       `-- vts      <== vts of core and effect API common version independent code
 |
-|-- device           <== code relative to the device API
-|   |-- 2.0          <== 2.0 device API code (except .hal, see audio/2.0)
+|-- core           <== code relative to the core API
+|   |-- 2.0          <== 2.0 core API code (except .hal, see audio/2.0)
 |   |   |-- default
 |   |   `-- vts
 |   |-- 4.0
-|   |   |-- default  <== default implementation of the device 4.0 api
+|   |   |-- default  <== default implementation of the core 4.0 api
 |   |   `-- vts      <== vts code of the 4.0 API
 |   |-- ...
 |   |   |-- default
 |   |   `-- vts
 |   `-- all_versions
 |       |-- default
-|       `-- vts      <== vts of device API common version independent code
+|       `-- vts      <== vts of core API common version independent code
 |
 `-- effect           <== idem for the effect API
     |-- 2.0
diff --git a/audio/common/README b/audio/common/README
index 88cea46..cd03106 100644
--- a/audio/common/README
+++ b/audio/common/README
@@ -1 +1 @@
-This folder contains code common to audio device and effect API
+This folder contains code common to audio core and effect API
diff --git a/audio/device/2.0/default/Android.bp b/audio/core/2.0/default/Android.bp
similarity index 94%
rename from audio/device/2.0/default/Android.bp
rename to audio/core/2.0/default/Android.bp
index d0c466b..9847886 100644
--- a/audio/device/2.0/default/Android.bp
+++ b/audio/core/2.0/default/Android.bp
@@ -35,7 +35,7 @@
 
     header_libs: [
         "android.hardware.audio.common.util@all-versions",
-        "android.hardware.audio@all-versions-impl",
+        "android.hardware.audio.core@all-versions-impl",
         "libaudioclient_headers",
         "libaudio_system_headers",
         "libhardware_headers",
diff --git a/audio/device/2.0/default/Conversions.cpp b/audio/core/2.0/default/Conversions.cpp
similarity index 86%
rename from audio/device/2.0/default/Conversions.cpp
rename to audio/core/2.0/default/Conversions.cpp
index db5d8d0..6c32090 100644
--- a/audio/device/2.0/default/Conversions.cpp
+++ b/audio/core/2.0/default/Conversions.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "device/2.0/default/Conversions.h"
+#include "core/2.0/default/Conversions.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Conversions.impl.h>
+#include <core/all-versions/default/Conversions.impl.h>
 #undef AUDIO_HAL_VERSION
diff --git a/audio/device/2.0/default/Device.cpp b/audio/core/2.0/default/Device.cpp
similarity index 73%
rename from audio/device/2.0/default/Device.cpp
rename to audio/core/2.0/default/Device.cpp
index d5bbae8..221ea5c 100644
--- a/audio/device/2.0/default/Device.cpp
+++ b/audio/core/2.0/default/Device.cpp
@@ -16,13 +16,13 @@
 
 #define LOG_TAG "DeviceHAL"
 
-#include "device/2.0/default/Device.h"
+#include "core/2.0/default/Device.h"
 #include <HidlUtils.h>
-#include "device/2.0/default/Conversions.h"
-#include "device/2.0/default/StreamIn.h"
-#include "device/2.0/default/StreamOut.h"
-#include "device/all-versions/default/Util.h"
+#include "core/2.0/default/Conversions.h"
+#include "core/2.0/default/StreamIn.h"
+#include "core/2.0/default/StreamOut.h"
+#include "core/all-versions/default/Util.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Device.impl.h>
+#include <core/all-versions/default/Device.impl.h>
 #undef AUDIO_HAL_VERSION
diff --git a/audio/device/2.0/default/DevicesFactory.cpp b/audio/core/2.0/default/DevicesFactory.cpp
similarity index 78%
rename from audio/device/2.0/default/DevicesFactory.cpp
rename to audio/core/2.0/default/DevicesFactory.cpp
index 4732404..65a9ccd 100644
--- a/audio/device/2.0/default/DevicesFactory.cpp
+++ b/audio/core/2.0/default/DevicesFactory.cpp
@@ -16,10 +16,10 @@
 
 #define LOG_TAG "DevicesFactoryHAL"
 
-#include "device/2.0/default/DevicesFactory.h"
-#include "device/2.0/default/Device.h"
-#include "device/2.0/default/PrimaryDevice.h"
+#include "core/2.0/default/DevicesFactory.h"
+#include "core/2.0/default/Device.h"
+#include "core/2.0/default/PrimaryDevice.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/DevicesFactory.impl.h>
+#include <core/all-versions/default/DevicesFactory.impl.h>
 #undef AUDIO_HAL_VERSION
diff --git a/audio/device/2.0/default/OWNERS b/audio/core/2.0/default/OWNERS
similarity index 100%
rename from audio/device/2.0/default/OWNERS
rename to audio/core/2.0/default/OWNERS
diff --git a/audio/device/2.0/default/Conversions.cpp b/audio/core/2.0/default/ParametersUtil.cpp
similarity index 86%
copy from audio/device/2.0/default/Conversions.cpp
copy to audio/core/2.0/default/ParametersUtil.cpp
index db5d8d0..33a3ad9 100644
--- a/audio/device/2.0/default/Conversions.cpp
+++ b/audio/core/2.0/default/ParametersUtil.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "device/2.0/default/Conversions.h"
+#include "core/2.0/default/ParametersUtil.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Conversions.impl.h>
+#include <core/all-versions/default/ParametersUtil.impl.h>
 #undef AUDIO_HAL_VERSION
diff --git a/audio/device/2.0/default/PrimaryDevice.cpp b/audio/core/2.0/default/PrimaryDevice.cpp
similarity index 82%
rename from audio/device/2.0/default/PrimaryDevice.cpp
rename to audio/core/2.0/default/PrimaryDevice.cpp
index 1f6e7b5..ce57403 100644
--- a/audio/device/2.0/default/PrimaryDevice.cpp
+++ b/audio/core/2.0/default/PrimaryDevice.cpp
@@ -16,9 +16,9 @@
 
 #define LOG_TAG "PrimaryDeviceHAL"
 
-#include "device/2.0/default/PrimaryDevice.h"
-#include "device/all-versions/default/Util.h"
+#include "core/2.0/default/PrimaryDevice.h"
+#include "core/all-versions/default/Util.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/PrimaryDevice.impl.h>
+#include <core/all-versions/default/PrimaryDevice.impl.h>
 #undef AUDIO_HAL_VERSION
diff --git a/audio/device/2.0/default/Stream.cpp b/audio/core/2.0/default/Stream.cpp
similarity index 84%
rename from audio/device/2.0/default/Stream.cpp
rename to audio/core/2.0/default/Stream.cpp
index bdc6146..69ee659 100644
--- a/audio/device/2.0/default/Stream.cpp
+++ b/audio/core/2.0/default/Stream.cpp
@@ -16,10 +16,10 @@
 
 #define LOG_TAG "StreamHAL"
 
-#include "device/2.0/default/Stream.h"
+#include "core/2.0/default/Stream.h"
 #include "common/all-versions/default/EffectMap.h"
-#include "device/2.0/default/Conversions.h"
+#include "core/2.0/default/Conversions.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Stream.impl.h>
+#include <core/all-versions/default/Stream.impl.h>
 #undef AUDIO_HAL_VERSION
diff --git a/audio/device/2.0/default/StreamIn.cpp b/audio/core/2.0/default/StreamIn.cpp
similarity index 83%
rename from audio/device/2.0/default/StreamIn.cpp
rename to audio/core/2.0/default/StreamIn.cpp
index f97f6b3..6b8776e 100644
--- a/audio/device/2.0/default/StreamIn.cpp
+++ b/audio/core/2.0/default/StreamIn.cpp
@@ -16,9 +16,9 @@
 
 #define LOG_TAG "StreamInHAL"
 
-#include "device/2.0/default/StreamIn.h"
-#include "device/all-versions/default/Util.h"
+#include "core/2.0/default/StreamIn.h"
+#include "core/all-versions/default/Util.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/StreamIn.impl.h>
+#include <core/all-versions/default/StreamIn.impl.h>
 #undef AUDIO_HAL_VERSION
diff --git a/audio/device/2.0/default/StreamOut.cpp b/audio/core/2.0/default/StreamOut.cpp
similarity index 82%
rename from audio/device/2.0/default/StreamOut.cpp
rename to audio/core/2.0/default/StreamOut.cpp
index 152c4d2..7f1461a 100644
--- a/audio/device/2.0/default/StreamOut.cpp
+++ b/audio/core/2.0/default/StreamOut.cpp
@@ -16,9 +16,9 @@
 
 #define LOG_TAG "StreamOutHAL"
 
-#include "device/2.0/default/StreamOut.h"
-#include "device/all-versions/default/Util.h"
+#include "core/2.0/default/StreamOut.h"
+#include "core/all-versions/default/Util.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/StreamOut.impl.h>
+#include <core/all-versions/default/StreamOut.impl.h>
 #undef AUDIO_HAL_VERSION
diff --git a/audio/device/2.0/default/include/device/2.0/default/Conversions.h b/audio/core/2.0/default/include/core/2.0/default/Conversions.h
similarity index 93%
rename from audio/device/2.0/default/include/device/2.0/default/Conversions.h
rename to audio/core/2.0/default/include/core/2.0/default/Conversions.h
index 4579361..b3a6ea8 100644
--- a/audio/device/2.0/default/include/device/2.0/default/Conversions.h
+++ b/audio/core/2.0/default/include/core/2.0/default/Conversions.h
@@ -20,7 +20,7 @@
 #include <android/hardware/audio/2.0/types.h>
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Conversions.h>
+#include <core/all-versions/default/Conversions.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_CONVERSIONS_H_
diff --git a/audio/device/2.0/default/include/device/2.0/default/Device.h b/audio/core/2.0/default/include/core/2.0/default/Device.h
similarity index 94%
rename from audio/device/2.0/default/include/device/2.0/default/Device.h
rename to audio/core/2.0/default/include/core/2.0/default/Device.h
index d28f6ba..3ec7464 100644
--- a/audio/device/2.0/default/include/device/2.0/default/Device.h
+++ b/audio/core/2.0/default/include/core/2.0/default/Device.h
@@ -22,7 +22,7 @@
 #include "ParametersUtil.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Device.h>
+#include <core/all-versions/default/Device.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_DEVICE_H
diff --git a/audio/device/2.0/default/include/device/2.0/default/DevicesFactory.h b/audio/core/2.0/default/include/core/2.0/default/DevicesFactory.h
similarity index 93%
rename from audio/device/2.0/default/include/device/2.0/default/DevicesFactory.h
rename to audio/core/2.0/default/include/core/2.0/default/DevicesFactory.h
index 919154a..8e8ee88 100644
--- a/audio/device/2.0/default/include/device/2.0/default/DevicesFactory.h
+++ b/audio/core/2.0/default/include/core/2.0/default/DevicesFactory.h
@@ -20,7 +20,7 @@
 #include <android/hardware/audio/2.0/IDevicesFactory.h>
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/DevicesFactory.h>
+#include <core/all-versions/default/DevicesFactory.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_DEVICESFACTORY_H
diff --git a/audio/device/2.0/default/include/device/2.0/default/ParametersUtil.h b/audio/core/2.0/default/include/core/2.0/default/ParametersUtil.h
similarity index 93%
rename from audio/device/2.0/default/include/device/2.0/default/ParametersUtil.h
rename to audio/core/2.0/default/include/core/2.0/default/ParametersUtil.h
index 7d4c46f..a5c1c78 100644
--- a/audio/device/2.0/default/include/device/2.0/default/ParametersUtil.h
+++ b/audio/core/2.0/default/include/core/2.0/default/ParametersUtil.h
@@ -20,7 +20,7 @@
 #include <android/hardware/audio/2.0/types.h>
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/ParametersUtil.h>
+#include <core/all-versions/default/ParametersUtil.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_PARAMETERS_UTIL_H_
diff --git a/audio/device/2.0/default/include/device/2.0/default/PrimaryDevice.h b/audio/core/2.0/default/include/core/2.0/default/PrimaryDevice.h
similarity index 93%
rename from audio/device/2.0/default/include/device/2.0/default/PrimaryDevice.h
rename to audio/core/2.0/default/include/core/2.0/default/PrimaryDevice.h
index e1fb4fe..f898597 100644
--- a/audio/device/2.0/default/include/device/2.0/default/PrimaryDevice.h
+++ b/audio/core/2.0/default/include/core/2.0/default/PrimaryDevice.h
@@ -22,7 +22,7 @@
 #include "Device.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/PrimaryDevice.h>
+#include <core/all-versions/default/PrimaryDevice.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_PRIMARYDEVICE_H
diff --git a/audio/device/2.0/default/include/device/2.0/default/Stream.h b/audio/core/2.0/default/include/core/2.0/default/Stream.h
similarity index 94%
rename from audio/device/2.0/default/include/device/2.0/default/Stream.h
rename to audio/core/2.0/default/include/core/2.0/default/Stream.h
index d059117..a2d8456 100644
--- a/audio/device/2.0/default/include/device/2.0/default/Stream.h
+++ b/audio/core/2.0/default/include/core/2.0/default/Stream.h
@@ -22,7 +22,7 @@
 #include "ParametersUtil.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/Stream.h>
+#include <core/all-versions/default/Stream.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H
diff --git a/audio/device/2.0/default/include/device/2.0/default/StreamIn.h b/audio/core/2.0/default/include/core/2.0/default/StreamIn.h
similarity index 94%
rename from audio/device/2.0/default/include/device/2.0/default/StreamIn.h
rename to audio/core/2.0/default/include/core/2.0/default/StreamIn.h
index 28481f9..c36abbd 100644
--- a/audio/device/2.0/default/include/device/2.0/default/StreamIn.h
+++ b/audio/core/2.0/default/include/core/2.0/default/StreamIn.h
@@ -23,7 +23,7 @@
 #include "Stream.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/StreamIn.h>
+#include <core/all-versions/default/StreamIn.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_STREAMIN_H
diff --git a/audio/device/2.0/default/include/device/2.0/default/StreamOut.h b/audio/core/2.0/default/include/core/2.0/default/StreamOut.h
similarity index 94%
rename from audio/device/2.0/default/include/device/2.0/default/StreamOut.h
rename to audio/core/2.0/default/include/core/2.0/default/StreamOut.h
index 7ab7178..ab35687 100644
--- a/audio/device/2.0/default/include/device/2.0/default/StreamOut.h
+++ b/audio/core/2.0/default/include/core/2.0/default/StreamOut.h
@@ -23,7 +23,7 @@
 #include "Stream.h"
 
 #define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/StreamOut.h>
+#include <core/all-versions/default/StreamOut.h>
 #undef AUDIO_HAL_VERSION
 
 #endif  // ANDROID_HARDWARE_AUDIO_V2_0_STREAMOUT_H
diff --git a/audio/device/all-versions/OWNERS b/audio/core/all-versions/OWNERS
similarity index 100%
rename from audio/device/all-versions/OWNERS
rename to audio/core/all-versions/OWNERS
diff --git a/audio/device/all-versions/default/Android.bp b/audio/core/all-versions/default/Android.bp
similarity index 91%
rename from audio/device/all-versions/default/Android.bp
rename to audio/core/all-versions/default/Android.bp
index 3029359..214b8d5 100644
--- a/audio/device/all-versions/default/Android.bp
+++ b/audio/core/all-versions/default/Android.bp
@@ -1,5 +1,5 @@
 cc_library_headers {
-    name: "android.hardware.audio@all-versions-impl",
+    name: "android.hardware.audio.core@all-versions-impl",
     relative_install_path: "hw",
     proprietary: true,
     vendor: true,
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Conversions.h b/audio/core/all-versions/default/include/core/all-versions/default/Conversions.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/Conversions.h
rename to audio/core/all-versions/default/include/core/all-versions/default/Conversions.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Conversions.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/Conversions.impl.h
rename to audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Device.h b/audio/core/all-versions/default/include/core/all-versions/default/Device.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/Device.h
rename to audio/core/all-versions/default/include/core/all-versions/default/Device.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Device.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/Device.impl.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/Device.impl.h
rename to audio/core/all-versions/default/include/core/all-versions/default/Device.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.h b/audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.h
rename to audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.impl.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/DevicesFactory.impl.h
rename to audio/core/all-versions/default/include/core/all-versions/default/DevicesFactory.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.h b/audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.h
rename to audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.impl.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/ParametersUtil.impl.h
rename to audio/core/all-versions/default/include/core/all-versions/default/ParametersUtil.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.h b/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.h
rename to audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/PrimaryDevice.impl.h
rename to audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Stream.h b/audio/core/all-versions/default/include/core/all-versions/default/Stream.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/Stream.h
rename to audio/core/all-versions/default/include/core/all-versions/default/Stream.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Stream.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/Stream.impl.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/Stream.impl.h
rename to audio/core/all-versions/default/include/core/all-versions/default/Stream.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/StreamIn.h b/audio/core/all-versions/default/include/core/all-versions/default/StreamIn.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/StreamIn.h
rename to audio/core/all-versions/default/include/core/all-versions/default/StreamIn.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/StreamIn.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/StreamIn.impl.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/StreamIn.impl.h
rename to audio/core/all-versions/default/include/core/all-versions/default/StreamIn.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/StreamOut.h b/audio/core/all-versions/default/include/core/all-versions/default/StreamOut.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/StreamOut.h
rename to audio/core/all-versions/default/include/core/all-versions/default/StreamOut.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/StreamOut.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/StreamOut.impl.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/StreamOut.impl.h
rename to audio/core/all-versions/default/include/core/all-versions/default/StreamOut.impl.h
diff --git a/audio/device/all-versions/default/include/device/all-versions/default/Util.h b/audio/core/all-versions/default/include/core/all-versions/default/Util.h
similarity index 100%
rename from audio/device/all-versions/default/include/device/all-versions/default/Util.h
rename to audio/core/all-versions/default/include/core/all-versions/default/Util.h
diff --git a/audio/device/2.0/default/ParametersUtil.cpp b/audio/device/2.0/default/ParametersUtil.cpp
deleted file mode 100644
index 8fabf5f..0000000
--- a/audio/device/2.0/default/ParametersUtil.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "device/2.0/default/ParametersUtil.h"
-
-#define AUDIO_HAL_VERSION V2_0
-#include <device/all-versions/default/ParametersUtil.impl.h>
-#undef AUDIO_HAL_VERSION