diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig
index b1c883329fd..70e87c274b2 100644
--- a/drivers/sensor/Kconfig
+++ b/drivers/sensor/Kconfig
@@ -72,7 +72,7 @@ source "drivers/sensor/hp206c/Kconfig"
 
 source "drivers/sensor/hts221/Kconfig"
 
-source "drivers/sensor/Kconfig.isl29035"
+source "drivers/sensor/isl29035/Kconfig"
 
 source "drivers/sensor/Kconfig.lis3dh"
 
diff --git a/drivers/sensor/Makefile b/drivers/sensor/Makefile
index b19a7ae3d45..79f5ca3fc99 100644
--- a/drivers/sensor/Makefile
+++ b/drivers/sensor/Makefile
@@ -11,8 +11,7 @@ obj-$(CONFIG_HDC1008) += hdc1008/
 obj-$(CONFIG_HMC5883L) += hmc5883l/
 obj-$(CONFIG_HP206C) += hp206c/
 obj-$(CONFIG_HTS221) += hts221/
-obj-$(CONFIG_ISL29035) += sensor_isl29035.o
-obj-$(CONFIG_ISL29035_TRIGGER) += sensor_isl29035_trigger.o
+obj-$(CONFIG_ISL29035) += isl29035/
 obj-$(CONFIG_LIS3DH) += sensor_lis3dh.o
 obj-$(CONFIG_LIS3DH_TRIGGER) += sensor_lis3dh_trigger.o
 obj-$(CONFIG_LIS3MDL) += sensor_lis3mdl.o
diff --git a/drivers/sensor/Kconfig.isl29035 b/drivers/sensor/isl29035/Kconfig
similarity index 98%
rename from drivers/sensor/Kconfig.isl29035
rename to drivers/sensor/isl29035/Kconfig
index 6615c725ba1..27b132f1038 100644
--- a/drivers/sensor/Kconfig.isl29035
+++ b/drivers/sensor/isl29035/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig.isl29035 - ISL29035 light sensor configuration options
+# Kconfig - ISL29035 light sensor configuration options
 
 #
 # Copyright (c) 2016 Intel Corporation
diff --git a/drivers/sensor/isl29035/Makefile b/drivers/sensor/isl29035/Makefile
new file mode 100644
index 00000000000..9d35bbdb099
--- /dev/null
+++ b/drivers/sensor/isl29035/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_ISL29035) += isl29035.o
+obj-$(CONFIG_ISL29035_TRIGGER) += isl29035_trigger.o
diff --git a/drivers/sensor/sensor_isl29035.c b/drivers/sensor/isl29035/isl29035.c
similarity index 99%
rename from drivers/sensor/sensor_isl29035.c
rename to drivers/sensor/isl29035/isl29035.c
index 61b8436e815..990324afd32 100644
--- a/drivers/sensor/sensor_isl29035.c
+++ b/drivers/sensor/isl29035/isl29035.c
@@ -22,7 +22,7 @@
 #include <sensor.h>
 #include <misc/__assert.h>
 
-#include "sensor_isl29035.h"
+#include "isl29035.h"
 
 static int isl29035_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
diff --git a/drivers/sensor/sensor_isl29035.h b/drivers/sensor/isl29035/isl29035.h
similarity index 100%
rename from drivers/sensor/sensor_isl29035.h
rename to drivers/sensor/isl29035/isl29035.h
diff --git a/drivers/sensor/sensor_isl29035_trigger.c b/drivers/sensor/isl29035/isl29035_trigger.c
similarity index 99%
rename from drivers/sensor/sensor_isl29035_trigger.c
rename to drivers/sensor/isl29035/isl29035_trigger.c
index 0ec54a68fd5..0bb785216cb 100644
--- a/drivers/sensor/sensor_isl29035_trigger.c
+++ b/drivers/sensor/isl29035/isl29035_trigger.c
@@ -20,7 +20,7 @@
 #include <misc/util.h>
 #include <nanokernel.h>
 
-#include "sensor_isl29035.h"
+#include "isl29035.h"
 
 extern struct isl29035_driver_data isl29035_data;