diff --git a/ctru-sys/src/lib.rs b/ctru-sys/src/lib.rs
index 6676277..15e4005 100644
--- a/ctru-sys/src/lib.rs
+++ b/ctru-sys/src/lib.rs
@@ -4,27 +4,25 @@
  */
 
 #![no_std]
-#![allow(non_camel_case_types)]
-#![allow(non_snake_case)]
-#![allow(overflowing_literals)]
+#![feature(question_mark)]
+#![allow(non_camel_case_types, non_snake_case, overflowing_literals)]
 
 pub mod console;
 pub mod env;
 pub mod gfx;
 pub mod gpu;
 pub mod ipc;
-pub mod lock;
-pub mod libc;
 pub mod os;
 pub mod sdmc;
-pub mod srv;
+pub mod services;
 pub mod svc;
+pub mod srv;
+pub mod sys;
 pub mod synchronization;
 pub mod thread;
 pub mod types;
 
-pub mod services;
-
+pub use self::sys::*;
 pub use self::types::*;
 
 pub type Result = i32;
diff --git a/ctru-sys/src/libc.rs b/ctru-sys/src/sys/libc.rs
similarity index 100%
rename from ctru-sys/src/libc.rs
rename to ctru-sys/src/sys/libc.rs
diff --git a/ctru-sys/src/lock.rs b/ctru-sys/src/sys/lock.rs
similarity index 95%
rename from ctru-sys/src/lock.rs
rename to ctru-sys/src/sys/lock.rs
index 6a9bd1b..dcab2d7 100644
--- a/ctru-sys/src/lock.rs
+++ b/ctru-sys/src/sys/lock.rs
@@ -1,7 +1,5 @@
 //<sys/lock.h> from devkitArm, needed for synchronization.rs to compile
 
-//TODO: I don't even know this thing looks really spooky
-
 pub type _LOCK_T = i32;
 #[repr(C)]
 #[derive(Copy)]
diff --git a/ctru-sys/src/sys/mod.rs b/ctru-sys/src/sys/mod.rs
new file mode 100644
index 0000000..ca421e7
--- /dev/null
+++ b/ctru-sys/src/sys/mod.rs
@@ -0,0 +1,2 @@
+pub mod lock;
+pub mod libc;