diff --git a/android/JNI.cpp b/android/cpp/JNI.cpp
similarity index 100%
rename from android/JNI.cpp
rename to android/cpp/JNI.cpp
diff --git a/android/NativeMapView.cpp b/android/cpp/NativeMapView.cpp
similarity index 100%
rename from android/NativeMapView.cpp
rename to android/cpp/NativeMapView.cpp
diff --git a/android/NativeMapView.hpp b/android/cpp/NativeMapView.hpp
similarity index 100%
rename from android/NativeMapView.hpp
rename to android/cpp/NativeMapView.hpp
diff --git a/android/log.h b/android/cpp/log.h
similarity index 100%
rename from android/log.h
rename to android/cpp/log.h
diff --git a/android/mapboxgl-app.gyp b/android/mapboxgl-app.gyp
index 203069ace..98b6b4ba4 100644
--- a/android/mapboxgl-app.gyp
+++ b/android/mapboxgl-app.gyp
@@ -8,8 +8,8 @@
       'product_name': 'mapbox-gl',
       'type': 'shared_library',
       'sources': [
-        './NativeMapView.cpp',
-        './JNI.cpp',
+        './cpp/NativeMapView.cpp',
+        './cpp/JNI.cpp',
       ],
       'cflags_cc': [
         '-I<(boost_root)/include',