diff --git a/services/inputflinger/reader/Android.bp b/services/inputflinger/reader/Android.bp
index 7b30765..a64f4dd 100644
--- a/services/inputflinger/reader/Android.bp
+++ b/services/inputflinger/reader/Android.bp
@@ -14,7 +14,11 @@
 
 cc_library_headers {
     name: "libinputreader_headers",
-    export_include_dirs: ["include"],
+    export_include_dirs: [
+        "include",
+        "mapper",
+        "mapper/accumulator",
+    ],
 }
 
 cc_library_shared {
@@ -22,26 +26,26 @@
     defaults: ["inputflinger_defaults"],
 
     srcs: [
-        "CursorButtonAccumulator.cpp",
-        "CursorInputMapper.cpp",
-        "CursorScrollAccumulator.cpp",
         "EventHub.cpp",
-        "ExternalStylusInputMapper.cpp",
         "InputDevice.cpp",
-        "InputMapper.cpp",
+        "mapper/accumulator/CursorButtonAccumulator.cpp",
+        "mapper/accumulator/CursorScrollAccumulator.cpp",
+        "mapper/accumulator/SingleTouchMotionAccumulator.cpp",
+        "mapper/accumulator/TouchButtonAccumulator.cpp",
+        "mapper/CursorInputMapper.cpp",
+        "mapper/ExternalStylusInputMapper.cpp",
+        "mapper/InputMapper.cpp",
+        "mapper/JoystickInputMapper.cpp",
+        "mapper/KeyboardInputMapper.cpp",
+        "mapper/MultiTouchInputMapper.cpp",
+        "mapper/RotaryEncoderInputMapper.cpp",
+        "mapper/SingleTouchInputMapper.cpp",
+        "mapper/SwitchInputMapper.cpp",
+        "mapper/TouchInputMapper.cpp",
+        "mapper/VibratorInputMapper.cpp",
         "InputReader.cpp",
         "InputReaderFactory.cpp",
-        "JoystickInputMapper.cpp",
-        "KeyboardInputMapper.cpp",
-        "MultiTouchInputMapper.cpp",
-        "RotaryEncoderInputMapper.cpp",
-        "SingleTouchInputMapper.cpp",
-        "SingleTouchMotionAccumulator.cpp",
-        "SwitchInputMapper.cpp",
-        "TouchButtonAccumulator.cpp",
-        "TouchInputMapper.cpp",
         "TouchVideoDevice.cpp",
-        "VibratorInputMapper.cpp",
     ],
 
     shared_libs: [
diff --git a/services/inputflinger/reader/CursorInputMapper.cpp b/services/inputflinger/reader/mapper/CursorInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/CursorInputMapper.cpp
rename to services/inputflinger/reader/mapper/CursorInputMapper.cpp
diff --git a/services/inputflinger/reader/include/CursorInputMapper.h b/services/inputflinger/reader/mapper/CursorInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/include/CursorInputMapper.h
rename to services/inputflinger/reader/mapper/CursorInputMapper.h
diff --git a/services/inputflinger/reader/ExternalStylusInputMapper.cpp b/services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/ExternalStylusInputMapper.cpp
rename to services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp
diff --git a/services/inputflinger/reader/ExternalStylusInputMapper.h b/services/inputflinger/reader/mapper/ExternalStylusInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/ExternalStylusInputMapper.h
rename to services/inputflinger/reader/mapper/ExternalStylusInputMapper.h
diff --git a/services/inputflinger/reader/InputMapper.cpp b/services/inputflinger/reader/mapper/InputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/InputMapper.cpp
rename to services/inputflinger/reader/mapper/InputMapper.cpp
diff --git a/services/inputflinger/reader/include/InputMapper.h b/services/inputflinger/reader/mapper/InputMapper.h
similarity index 100%
rename from services/inputflinger/reader/include/InputMapper.h
rename to services/inputflinger/reader/mapper/InputMapper.h
diff --git a/services/inputflinger/reader/JoystickInputMapper.cpp b/services/inputflinger/reader/mapper/JoystickInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/JoystickInputMapper.cpp
rename to services/inputflinger/reader/mapper/JoystickInputMapper.cpp
diff --git a/services/inputflinger/reader/JoystickInputMapper.h b/services/inputflinger/reader/mapper/JoystickInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/JoystickInputMapper.h
rename to services/inputflinger/reader/mapper/JoystickInputMapper.h
diff --git a/services/inputflinger/reader/KeyboardInputMapper.cpp b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/KeyboardInputMapper.cpp
rename to services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
diff --git a/services/inputflinger/reader/include/KeyboardInputMapper.h b/services/inputflinger/reader/mapper/KeyboardInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/include/KeyboardInputMapper.h
rename to services/inputflinger/reader/mapper/KeyboardInputMapper.h
diff --git a/services/inputflinger/reader/MultiTouchInputMapper.cpp b/services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/MultiTouchInputMapper.cpp
rename to services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp
diff --git a/services/inputflinger/reader/include/MultiTouchInputMapper.h b/services/inputflinger/reader/mapper/MultiTouchInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/include/MultiTouchInputMapper.h
rename to services/inputflinger/reader/mapper/MultiTouchInputMapper.h
diff --git a/services/inputflinger/reader/RotaryEncoderInputMapper.cpp b/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/RotaryEncoderInputMapper.cpp
rename to services/inputflinger/reader/mapper/RotaryEncoderInputMapper.cpp
diff --git a/services/inputflinger/reader/RotaryEncoderInputMapper.h b/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/RotaryEncoderInputMapper.h
rename to services/inputflinger/reader/mapper/RotaryEncoderInputMapper.h
diff --git a/services/inputflinger/reader/SingleTouchInputMapper.cpp b/services/inputflinger/reader/mapper/SingleTouchInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/SingleTouchInputMapper.cpp
rename to services/inputflinger/reader/mapper/SingleTouchInputMapper.cpp
diff --git a/services/inputflinger/reader/include/SingleTouchInputMapper.h b/services/inputflinger/reader/mapper/SingleTouchInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/include/SingleTouchInputMapper.h
rename to services/inputflinger/reader/mapper/SingleTouchInputMapper.h
diff --git a/services/inputflinger/reader/SwitchInputMapper.cpp b/services/inputflinger/reader/mapper/SwitchInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/SwitchInputMapper.cpp
rename to services/inputflinger/reader/mapper/SwitchInputMapper.cpp
diff --git a/services/inputflinger/reader/include/SwitchInputMapper.h b/services/inputflinger/reader/mapper/SwitchInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/include/SwitchInputMapper.h
rename to services/inputflinger/reader/mapper/SwitchInputMapper.h
diff --git a/services/inputflinger/reader/TouchCursorInputMapperCommon.h b/services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h
similarity index 100%
rename from services/inputflinger/reader/TouchCursorInputMapperCommon.h
rename to services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h
diff --git a/services/inputflinger/reader/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/TouchInputMapper.cpp
rename to services/inputflinger/reader/mapper/TouchInputMapper.cpp
diff --git a/services/inputflinger/reader/include/TouchInputMapper.h b/services/inputflinger/reader/mapper/TouchInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/include/TouchInputMapper.h
rename to services/inputflinger/reader/mapper/TouchInputMapper.h
diff --git a/services/inputflinger/reader/VibratorInputMapper.cpp b/services/inputflinger/reader/mapper/VibratorInputMapper.cpp
similarity index 100%
rename from services/inputflinger/reader/VibratorInputMapper.cpp
rename to services/inputflinger/reader/mapper/VibratorInputMapper.cpp
diff --git a/services/inputflinger/reader/VibratorInputMapper.h b/services/inputflinger/reader/mapper/VibratorInputMapper.h
similarity index 100%
rename from services/inputflinger/reader/VibratorInputMapper.h
rename to services/inputflinger/reader/mapper/VibratorInputMapper.h
diff --git a/services/inputflinger/reader/CursorButtonAccumulator.cpp b/services/inputflinger/reader/mapper/accumulator/CursorButtonAccumulator.cpp
similarity index 100%
rename from services/inputflinger/reader/CursorButtonAccumulator.cpp
rename to services/inputflinger/reader/mapper/accumulator/CursorButtonAccumulator.cpp
diff --git a/services/inputflinger/reader/include/CursorButtonAccumulator.h b/services/inputflinger/reader/mapper/accumulator/CursorButtonAccumulator.h
similarity index 100%
rename from services/inputflinger/reader/include/CursorButtonAccumulator.h
rename to services/inputflinger/reader/mapper/accumulator/CursorButtonAccumulator.h
diff --git a/services/inputflinger/reader/CursorScrollAccumulator.cpp b/services/inputflinger/reader/mapper/accumulator/CursorScrollAccumulator.cpp
similarity index 100%
rename from services/inputflinger/reader/CursorScrollAccumulator.cpp
rename to services/inputflinger/reader/mapper/accumulator/CursorScrollAccumulator.cpp
diff --git a/services/inputflinger/reader/include/CursorScrollAccumulator.h b/services/inputflinger/reader/mapper/accumulator/CursorScrollAccumulator.h
similarity index 100%
rename from services/inputflinger/reader/include/CursorScrollAccumulator.h
rename to services/inputflinger/reader/mapper/accumulator/CursorScrollAccumulator.h
diff --git a/services/inputflinger/reader/SingleTouchMotionAccumulator.cpp b/services/inputflinger/reader/mapper/accumulator/SingleTouchMotionAccumulator.cpp
similarity index 100%
rename from services/inputflinger/reader/SingleTouchMotionAccumulator.cpp
rename to services/inputflinger/reader/mapper/accumulator/SingleTouchMotionAccumulator.cpp
diff --git a/services/inputflinger/reader/include/SingleTouchMotionAccumulator.h b/services/inputflinger/reader/mapper/accumulator/SingleTouchMotionAccumulator.h
similarity index 100%
rename from services/inputflinger/reader/include/SingleTouchMotionAccumulator.h
rename to services/inputflinger/reader/mapper/accumulator/SingleTouchMotionAccumulator.h
diff --git a/services/inputflinger/reader/TouchButtonAccumulator.cpp b/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp
similarity index 100%
rename from services/inputflinger/reader/TouchButtonAccumulator.cpp
rename to services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.cpp
diff --git a/services/inputflinger/reader/include/TouchButtonAccumulator.h b/services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.h
similarity index 100%
rename from services/inputflinger/reader/include/TouchButtonAccumulator.h
rename to services/inputflinger/reader/mapper/accumulator/TouchButtonAccumulator.h
diff --git a/services/inputflinger/tests/InputReader_test.cpp b/services/inputflinger/tests/InputReader_test.cpp
index a9088bc..2153108 100644
--- a/services/inputflinger/tests/InputReader_test.cpp
+++ b/services/inputflinger/tests/InputReader_test.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include "InputReader.h"
-#include "CursorInputMapper.h"
-#include "InputDevice.h"
-#include "InputMapper.h"
-#include "KeyboardInputMapper.h"
-#include "MultiTouchInputMapper.h"
-#include "SingleTouchInputMapper.h"
-#include "SwitchInputMapper.h"
-#include "TestInputListener.h"
-#include "TouchInputMapper.h"
+#include <CursorInputMapper.h>
+#include <InputDevice.h>
+#include <InputMapper.h>
+#include <InputReader.h>
+#include <KeyboardInputMapper.h>
+#include <MultiTouchInputMapper.h>
+#include <SingleTouchInputMapper.h>
+#include <SwitchInputMapper.h>
+#include <TestInputListener.h>
+#include <TouchInputMapper.h>
 
 #include <gtest/gtest.h>
 #include <inttypes.h>