diff --git a/examples/collatz/collatz.q b/examples/collatz/collatz.q
index 00048d6..0b92c3a 100644
--- a/examples/collatz/collatz.q
+++ b/examples/collatz/collatz.q
@@ -1,3 +1,4 @@
+import fmt
 import io
 
 main() {
@@ -12,7 +13,7 @@ collatz(x int) {
 			x = 3 * x + 1
 		}
 
-		io.number(x)
+		fmt.decimal(x)
 
 		if x == 1 {
 			return
diff --git a/examples/factorial/factorial.q b/examples/factorial/factorial.q
index 07390b5..222153f 100644
--- a/examples/factorial/factorial.q
+++ b/examples/factorial/factorial.q
@@ -1,7 +1,7 @@
-import io
+import fmt
 
 main() {
-	io.number(factorial(5))
+	fmt.decimal(factorial(5))
 }
 
 factorial(x int) -> int {
diff --git a/examples/fibonacci/fibonacci.q b/examples/fibonacci/fibonacci.q
index d189253..db7b565 100644
--- a/examples/fibonacci/fibonacci.q
+++ b/examples/fibonacci/fibonacci.q
@@ -1,7 +1,7 @@
-import io
+import fmt
 
 main() {
-	io.number(fibonacci(10))
+	fmt.decimal(fibonacci(10))
 }
 
 fibonacci(x int) -> int {
diff --git a/examples/fizzbuzz/fizzbuzz.q b/examples/fizzbuzz/fizzbuzz.q
index e4986d1..bcdc027 100644
--- a/examples/fizzbuzz/fizzbuzz.q
+++ b/examples/fizzbuzz/fizzbuzz.q
@@ -1,3 +1,4 @@
+import fmt
 import io
 
 main() {
@@ -12,7 +13,7 @@ fizzbuzz(n int) {
 			x % 15 == 0 { io.out("FizzBuzz") }
 			x % 5 == 0  { io.out("Buzz") }
 			x % 3 == 0  { io.out("Fizz") }
-			_           { io.number(x) }
+			_           { fmt.decimal(x) }
 		}
 
 		x += 1
diff --git a/examples/gcd/gcd.q b/examples/gcd/gcd.q
index 9b6ece1..7deb773 100644
--- a/examples/gcd/gcd.q
+++ b/examples/gcd/gcd.q
@@ -1,7 +1,7 @@
-import io
+import fmt
 
 main() {
-	io.number(gcd(1071, 462))
+	fmt.decimal(gcd(1071, 462))
 }
 
 gcd(a int, b int) -> int {
diff --git a/examples/itoa/itoa.q b/examples/itoa/itoa.q
index 72d3599..68916fc 100644
--- a/examples/itoa/itoa.q
+++ b/examples/itoa/itoa.q
@@ -1,5 +1,5 @@
-import io
+import fmt
 
 main() {
-	io.number(9223372036854775807)
+	fmt.decimal(9223372036854775807)
 }
\ No newline at end of file
diff --git a/examples/prime/prime.q b/examples/prime/prime.q
index f29c701..fae869c 100644
--- a/examples/prime/prime.q
+++ b/examples/prime/prime.q
@@ -1,3 +1,4 @@
+import fmt
 import io
 
 main() {
@@ -14,7 +15,7 @@ main() {
 				io.out(" ")
 			}
 
-			io.number(i)
+			fmt.decimal(i)
 		}
 
 		i += 1
diff --git a/lib/io/fmt.q b/lib/fmt/fmt.q
similarity index 95%
rename from lib/io/fmt.q
rename to lib/fmt/fmt.q
index 230571c..311eb44 100644
--- a/lib/io/fmt.q
+++ b/lib/fmt/fmt.q
@@ -1,7 +1,7 @@
 import mem
 import sys
 
-number(x int) {
+decimal(x int) {
 	buffer := mem.alloc(20)
 	address, count := itoa(x, buffer)
 	sys.write(1, address, count)
diff --git a/lib/io/io.q b/lib/io/io.q
index 6c83d05..98ee9fe 100644
--- a/lib/io/io.q
+++ b/lib/io/io.q
@@ -12,14 +12,6 @@ error(buffer []byte) -> int {
 	return sys.write(std.err, buffer, len(buffer))
 }
 
-read(fd int, buffer []byte) -> int {
-	return sys.read(fd, buffer, len(buffer))
-}
-
-write(fd int, buffer []byte) -> int {
-	return sys.write(fd, buffer, len(buffer))
-}
-
 const {
 	std {
 		in 0
diff --git a/lib/io/read.q b/lib/io/read.q
new file mode 100644
index 0000000..7756c17
--- /dev/null
+++ b/lib/io/read.q
@@ -0,0 +1,5 @@
+import sys
+
+read(fd int, buffer []byte) -> int {
+	return sys.read(fd, buffer, len(buffer))
+}
\ No newline at end of file
diff --git a/lib/io/write.q b/lib/io/write.q
new file mode 100644
index 0000000..a46a22d
--- /dev/null
+++ b/lib/io/write.q
@@ -0,0 +1,5 @@
+import sys
+
+write(fd int, buffer []byte) -> int {
+	return sys.write(fd, buffer, len(buffer))
+}
\ No newline at end of file