diff --git a/modules/camera/3_4/array_vector.h b/modules/camera/3_4/metadata/array_vector.h
similarity index 96%
rename from modules/camera/3_4/array_vector.h
rename to modules/camera/3_4/metadata/array_vector.h
index 50fee6c..0481ed4 100644
--- a/modules/camera/3_4/array_vector.h
+++ b/modules/camera/3_4/metadata/array_vector.h
@@ -26,9 +26,9 @@
 // Specific methods to get number of arrays/number of elements
 // are provided and an ambiguous "size" is not, to avoid accidental
 // incorrect use.
-template <class T, int N>
+template <class T, size_t N>
 class ArrayVector {
-public:
+ public:
   const T* data() const { return mItems.data(); }
   // The number of arrays.
   size_t num_arrays() const { return mItems.size() / N; }
@@ -43,7 +43,7 @@
     mItems.insert(mItems.end(), values.begin(), values.end());
   }
 
-private:
+ private:
   std::vector<T> mItems;
 };
 
diff --git a/modules/camera/3_4/v4l2_camera.h b/modules/camera/3_4/v4l2_camera.h
index 2638993..17770b6 100644
--- a/modules/camera/3_4/v4l2_camera.h
+++ b/modules/camera/3_4/v4l2_camera.h
@@ -25,9 +25,9 @@
 
 #include <system/camera_metadata.h>
 
-#include "array_vector.h"
 #include "camera.h"
 #include "common.h"
+#include "metadata/array_vector.h"
 #include "v4l2_gralloc.h"
 #include "v4l2_wrapper.h"