diff --git a/adb/adb.go b/adb/device.go
similarity index 93%
rename from adb/adb.go
rename to adb/device.go
index e827160..ba1807b 100644
--- a/adb/adb.go
+++ b/adb/device.go
@@ -5,33 +5,13 @@ package adb
 
 import (
 	"bufio"
-	"fmt"
 	"io"
-	"net"
 	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
 )
 
-const (
-	host = "127.0.0.1"
-	port = 5037
-)
-
-func IsServerRunning() bool {
-	conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", host, port))
-	if err != nil {
-		return false
-	}
-	conn.Close()
-	return true
-}
-
-func StartServer() error {
-	return exec.Command("adb", "start-server").Run()
-}
-
 type Device struct {
 	ID      string
 	Usb     string
diff --git a/adb/server.go b/adb/server.go
new file mode 100644
index 0000000..001fe20
--- /dev/null
+++ b/adb/server.go
@@ -0,0 +1,28 @@
+// Copyright (c) 2015, Daniel Martí <mvdan@mvdan.cc>
+// See LICENSE for licensing information
+
+package adb
+
+import (
+	"fmt"
+	"net"
+	"os/exec"
+)
+
+const (
+	host = "127.0.0.1"
+	port = 5037
+)
+
+func IsServerRunning() bool {
+	conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", host, port))
+	if err != nil {
+		return false
+	}
+	conn.Close()
+	return true
+}
+
+func StartServer() error {
+	return exec.Command("adb", "start-server").Run()
+}