diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig
index 4c06562697d..9221690792d 100644
--- a/drivers/sensor/Kconfig
+++ b/drivers/sensor/Kconfig
@@ -94,7 +94,7 @@ source "drivers/sensor/mpu6050/Kconfig"
 
 source "drivers/sensor/sht3xd/Kconfig"
 
-source "drivers/sensor/Kconfig.sx9500"
+source "drivers/sensor/sx9500/Kconfig"
 
 source "drivers/sensor/th02/Kconfig"
 
diff --git a/drivers/sensor/Makefile b/drivers/sensor/Makefile
index e2fad8d6d57..28647409fc8 100644
--- a/drivers/sensor/Makefile
+++ b/drivers/sensor/Makefile
@@ -22,8 +22,7 @@ obj-$(CONFIG_MAX44009) += max44009/
 obj-$(CONFIG_MCP9808) += mcp9808/
 obj-$(CONFIG_MPU6050) += mpu6050/
 obj-$(CONFIG_SHT3XD) += sht3xd/
-obj-$(CONFIG_SX9500) += sensor_sx9500.o
-obj-$(CONFIG_SX9500_TRIGGER) += sensor_sx9500_trigger.o
+obj-$(CONFIG_SX9500) += sx9500/
 obj-$(CONFIG_TH02) += th02/
 obj-$(CONFIG_TMP007) += sensor_tmp007.o
 obj-$(CONFIG_TMP007_TRIGGER) += sensor_tmp007_trigger.o
diff --git a/drivers/sensor/Kconfig.sx9500 b/drivers/sensor/sx9500/Kconfig
similarity index 97%
rename from drivers/sensor/Kconfig.sx9500
rename to drivers/sensor/sx9500/Kconfig
index 95d1e32d2f3..0dabe39946f 100644
--- a/drivers/sensor/Kconfig.sx9500
+++ b/drivers/sensor/sx9500/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig.sx9500 - SX9500 SAR proximity sensor configuration options
+# Kconfig - SX9500 SAR proximity sensor configuration options
 
 #
 # Copyright (c) 2016 Intel Corporation
diff --git a/drivers/sensor/sx9500/Makefile b/drivers/sensor/sx9500/Makefile
new file mode 100644
index 00000000000..caf7095b8d5
--- /dev/null
+++ b/drivers/sensor/sx9500/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SX9500) += sx9500.o
+obj-$(CONFIG_SX9500_TRIGGER) += sx9500_trigger.o
diff --git a/drivers/sensor/sensor_sx9500.c b/drivers/sensor/sx9500/sx9500.c
similarity index 99%
rename from drivers/sensor/sensor_sx9500.c
rename to drivers/sensor/sx9500/sx9500.c
index efaa585e8b5..2442fd50919 100644
--- a/drivers/sensor/sensor_sx9500.c
+++ b/drivers/sensor/sx9500/sx9500.c
@@ -25,7 +25,7 @@
 #include <gpio.h>
 #include <misc/__assert.h>
 
-#include "sensor_sx9500.h"
+#include "sx9500.h"
 
 static uint8_t sx9500_reg_defaults[] = {
 	/*
diff --git a/drivers/sensor/sensor_sx9500.h b/drivers/sensor/sx9500/sx9500.h
similarity index 100%
rename from drivers/sensor/sensor_sx9500.h
rename to drivers/sensor/sx9500/sx9500.h
diff --git a/drivers/sensor/sensor_sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c
similarity index 99%
rename from drivers/sensor/sensor_sx9500_trigger.c
rename to drivers/sensor/sx9500/sx9500_trigger.c
index 9bbf6aec460..9e223d3e44c 100644
--- a/drivers/sensor/sensor_sx9500_trigger.c
+++ b/drivers/sensor/sx9500/sx9500_trigger.c
@@ -21,7 +21,7 @@
 #include <sensor.h>
 #include <gpio.h>
 #include <misc/util.h>
-#include "sensor_sx9500.h"
+#include "sx9500.h"
 
 #ifdef CONFIG_SX9500_TRIGGER_OWN_FIBER
 static char __stack sx9500_fiber_stack[CONFIG_SX9500_FIBER_STACK_SIZE];