diff --git a/nvidia/drivers/media/i2c/mt9m021.c b/kernel/nvidia/drivers/media/i2c/mt9m021.c
similarity index 100%
rename from nvidia/drivers/media/i2c/mt9m021.c
rename to kernel/nvidia/drivers/media/i2c/mt9m021.c
diff --git a/nvidia/drivers/media/i2c/mt9m021_mode_tbls.h b/kernel/nvidia/drivers/media/i2c/mt9m021_mode_tbls.h
similarity index 100%
rename from nvidia/drivers/media/i2c/mt9m021_mode_tbls.h
rename to kernel/nvidia/drivers/media/i2c/mt9m021_mode_tbls.h
diff --git a/nvidia/drivers/media/platform/tegra/camera/camera_common.c b/kernel/nvidia/drivers/media/platform/tegra/camera/camera_common.c
similarity index 100%
rename from nvidia/drivers/media/platform/tegra/camera/camera_common.c
rename to kernel/nvidia/drivers/media/platform/tegra/camera/camera_common.c
diff --git a/nvidia/drivers/media/platform/tegra/camera/tegracam_ctrls.c b/kernel/nvidia/drivers/media/platform/tegra/camera/tegracam_ctrls.c
similarity index 100%
rename from nvidia/drivers/media/platform/tegra/camera/tegracam_ctrls.c
rename to kernel/nvidia/drivers/media/platform/tegra/camera/tegracam_ctrls.c
diff --git a/nvidia/include/media/camera_common.h b/kernel/nvidia/include/media/camera_common.h
similarity index 100%
rename from nvidia/include/media/camera_common.h
rename to kernel/nvidia/include/media/camera_common.h
diff --git a/nvidia/include/media/tegra-v4l2-camera.h b/kernel/nvidia/include/media/tegra-v4l2-camera.h
similarity index 100%
rename from nvidia/include/media/tegra-v4l2-camera.h
rename to kernel/nvidia/include/media/tegra-v4l2-camera.h