diff --git a/universal7885-common/hidl-packages/camera/provider/Android.bp b/universal7885-common/camera/provider/Android.bp
similarity index 100%
rename from universal7885-common/hidl-packages/camera/provider/Android.bp
rename to universal7885-common/camera/provider/Android.bp
diff --git a/universal7885-common/hidl-packages/camera/provider/SamsungCameraProvider.cpp b/universal7885-common/camera/provider/SamsungCameraProvider.cpp
similarity index 100%
rename from universal7885-common/hidl-packages/camera/provider/SamsungCameraProvider.cpp
rename to universal7885-common/camera/provider/SamsungCameraProvider.cpp
diff --git a/universal7885-common/hidl-packages/camera/provider/SamsungCameraProvider.h b/universal7885-common/camera/provider/SamsungCameraProvider.h
similarity index 100%
rename from universal7885-common/hidl-packages/camera/provider/SamsungCameraProvider.h
rename to universal7885-common/camera/provider/SamsungCameraProvider.h
diff --git a/universal7885-common/hidl-packages/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc b/universal7885-common/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
similarity index 100%
rename from universal7885-common/hidl-packages/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
rename to universal7885-common/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
diff --git a/universal7885-common/hidl-packages/camera/provider/service.cpp b/universal7885-common/camera/provider/service.cpp
similarity index 100%
rename from universal7885-common/hidl-packages/camera/provider/service.cpp
rename to universal7885-common/camera/provider/service.cpp