diff --git a/src/conversion.rs b/src/conversion.rs
index 920b79ddb8..0247b1488c 100644
--- a/src/conversion.rs
+++ b/src/conversion.rs
@@ -30,7 +30,6 @@ use opencv::highgui;
 use opencv::imgproc;
 use opencv::prelude::*;
 
-use handwritten_wrapper::*;
 use k4a_sys_wrapper::Device;
 use k4a_sys_wrapper::device_get_installed_count;
 use k4a_sys_wrapper::Image;
diff --git a/src/graphics_glium.rs b/src/graphics_glium.rs
index b45ae13b03..6f06f7aedc 100644
--- a/src/graphics_glium.rs
+++ b/src/graphics_glium.rs
@@ -32,12 +32,11 @@ use opencv::imgproc;
 use opencv::prelude::*;
 
 use conversion::TextureData2d;
-use handwritten_wrapper::*;
-use handwritten_wrapper_test;
 use k4a_sys_wrapper::Device;
 use k4a_sys_wrapper::device_get_installed_count;
 use k4a_sys_wrapper::Image;
 use sensor_control::{capture_thread, grab_single_frame};
+use old_k4a_wrapper;
 
 pub struct TextureContainer {
   pub texture: Texture2d
@@ -233,7 +232,7 @@ pub fn run() {
     device.stop_cameras();
   }
 
-  handwritten_wrapper_test::test_integration();
+  old_k4a_wrapper::handwritten_wrapper_test::test_integration();
 }
 
 /// Copied from k4a-sys
diff --git a/src/k4a_sys_wrapper.rs b/src/k4a_sys_wrapper.rs
index 5b0f36503e..fc8d1b1ffe 100644
--- a/src/k4a_sys_wrapper.rs
+++ b/src/k4a_sys_wrapper.rs
@@ -7,8 +7,6 @@ use std::ptr;
 
 use k4a_sys;
 
-use handwritten_wrapper::{k4a_device_close, K4A_DEVICE_DEFAULT};
-
 pub fn device_get_installed_count() -> u32 {
   unsafe {
     k4a_sys::k4a_device_get_installed_count()
diff --git a/src/main.rs b/src/main.rs
index 989727169d..022620adb2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -46,7 +46,6 @@ use opencv::prelude::*;
 
 use conversion::TextureData2d;
 use graphics_glium::run_glium;
-use handwritten_wrapper::*;
 use k4a_sys_wrapper::Device;
 use k4a_sys_wrapper::device_get_installed_count;
 use k4a_sys_wrapper::Image;
@@ -55,8 +54,7 @@ use sensor_control::{capture_thread, grab_single_frame};
 pub mod conversion;
 pub mod graphics_glium;
 pub mod graphics_grr;
-pub mod handwritten_wrapper;
-pub mod handwritten_wrapper_test;
+pub mod old_k4a_wrapper;
 pub mod k4a_sys_wrapper;
 pub mod sensor_control;
 
diff --git a/src/handwritten_wrapper.rs b/src/old_k4a_wrapper/handwritten_wrapper.rs
similarity index 100%
rename from src/handwritten_wrapper.rs
rename to src/old_k4a_wrapper/handwritten_wrapper.rs
diff --git a/src/handwritten_wrapper_test.rs b/src/old_k4a_wrapper/handwritten_wrapper_test.rs
similarity index 92%
rename from src/handwritten_wrapper_test.rs
rename to src/old_k4a_wrapper/handwritten_wrapper_test.rs
index 44f1ceecb1..bdcf19a952 100644
--- a/src/handwritten_wrapper_test.rs
+++ b/src/old_k4a_wrapper/handwritten_wrapper_test.rs
@@ -4,7 +4,7 @@ use std::os::raw::c_char;
 
 use libc::size_t;
 
-use handwritten_wrapper::*;
+use old_k4a_wrapper::handwritten_wrapper::{k4a_device_close, K4A_DEVICE_DEFAULT, k4a_device_get_installed_count, k4a_device_get_serialnum, k4a_device_open, k4a_device_t};
 
 pub fn test_integration() {
   println!("hello world");
diff --git a/src/old_k4a_wrapper/mod.rs b/src/old_k4a_wrapper/mod.rs
new file mode 100644
index 0000000000..35d13e64b4
--- /dev/null
+++ b/src/old_k4a_wrapper/mod.rs
@@ -0,0 +1,2 @@
+pub mod handwritten_wrapper;
+pub mod handwritten_wrapper_test;
diff --git a/src/sensor_control.rs b/src/sensor_control.rs
index 9bf0b5d346..0b7bb5cfd9 100644
--- a/src/sensor_control.rs
+++ b/src/sensor_control.rs
@@ -29,7 +29,6 @@ use opencv::highgui;
 use opencv::imgproc;
 use opencv::prelude::*;
 
-use handwritten_wrapper::*;
 use k4a_sys_wrapper::Device;
 use k4a_sys_wrapper::device_get_installed_count;
 use k4a_sys_wrapper::Image;