diff --git a/amber/camera/Android.bp b/amber/camera/Android.bp
new file mode 100644
index 0000000..d0d2dad
--- /dev/null
+++ b/amber/camera/Android.bp
@@ -0,0 +1,26 @@
+/*
+ * Copyright 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.
+ */
+
+cc_library_headers {
+    name: "libhdrplusclient_headers",
+    proprietary: true,
+    owner: "google",
+    host_supported: false,
+    export_include_dirs: [
+        "include",
+        "libhdrplusclient/include",
+    ],
+}
diff --git a/camera/Android.mk b/amber/camera/Android.mk
similarity index 100%
rename from camera/Android.mk
rename to amber/camera/Android.mk
diff --git a/camera/include/HdrPlusProfiler.h b/amber/camera/include/HdrPlusProfiler.h
similarity index 100%
rename from camera/include/HdrPlusProfiler.h
rename to amber/camera/include/HdrPlusProfiler.h
diff --git a/camera/include/HdrPlusTypes.h b/amber/camera/include/HdrPlusTypes.h
similarity index 100%
rename from camera/include/HdrPlusTypes.h
rename to amber/camera/include/HdrPlusTypes.h
diff --git a/camera/libhdrplusclient/Android.mk b/amber/camera/libhdrplusclient/Android.mk
similarity index 93%
rename from camera/libhdrplusclient/Android.mk
rename to amber/camera/libhdrplusclient/Android.mk
index a24eeb2..18db0ac 100644
--- a/camera/libhdrplusclient/Android.mk
+++ b/amber/camera/libhdrplusclient/Android.mk
@@ -41,13 +41,13 @@
 
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/include \
-    hardware/google/easel/camera/include
+    hardware/google/easel/amber/camera/include
 
 LOCAL_CFLAGS += -Wall -Wextra -Werror
 
 LOCAL_EXPORT_C_INCLUDE_DIRS += \
     $(LOCAL_PATH)/include \
-    hardware/google/easel/camera/include
+    hardware/google/easel/amber/camera/include
 
 LOCAL_MODULE:= libhdrplusclient
 LOCAL_PROPRIETARY_MODULE := true
diff --git a/camera/libhdrplusclient/EaselManagerClient.cpp b/amber/camera/libhdrplusclient/EaselManagerClient.cpp
similarity index 100%
rename from camera/libhdrplusclient/EaselManagerClient.cpp
rename to amber/camera/libhdrplusclient/EaselManagerClient.cpp
diff --git a/camera/libhdrplusclient/HdrPlusClientUtils.cpp b/amber/camera/libhdrplusclient/HdrPlusClientUtils.cpp
similarity index 100%
rename from camera/libhdrplusclient/HdrPlusClientUtils.cpp
rename to amber/camera/libhdrplusclient/HdrPlusClientUtils.cpp
diff --git a/camera/libhdrplusclient/include/EaselManagerClient.h b/amber/camera/libhdrplusclient/include/EaselManagerClient.h
similarity index 100%
rename from camera/libhdrplusclient/include/EaselManagerClient.h
rename to amber/camera/libhdrplusclient/include/EaselManagerClient.h
diff --git a/camera/libhdrplusclient/include/HdrPlusClient.h b/amber/camera/libhdrplusclient/include/HdrPlusClient.h
similarity index 100%
rename from camera/libhdrplusclient/include/HdrPlusClient.h
rename to amber/camera/libhdrplusclient/include/HdrPlusClient.h
diff --git a/camera/libhdrplusclient/include/HdrPlusClientListener.h b/amber/camera/libhdrplusclient/include/HdrPlusClientListener.h
similarity index 100%
rename from camera/libhdrplusclient/include/HdrPlusClientListener.h
rename to amber/camera/libhdrplusclient/include/HdrPlusClientListener.h
diff --git a/camera/libhdrplusclient/include/HdrPlusClientUtils.h b/amber/camera/libhdrplusclient/include/HdrPlusClientUtils.h
similarity index 100%
rename from camera/libhdrplusclient/include/HdrPlusClientUtils.h
rename to amber/camera/libhdrplusclient/include/HdrPlusClientUtils.h