diff --git a/.gitignore b/.gitignore
index 11a5368..c75f2e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-grumble
+cmd/grumble/grumble
 .DS_Store
 *.[568ao]
 *.ao
diff --git a/README.markdown b/README.markdown
index 3ae602c..7db25bc 100644
--- a/README.markdown
+++ b/README.markdown
@@ -24,6 +24,6 @@ and on Windows, do something like this (for cmd.exe):
 
 Then, it's time to install Grumble. The following line should do the trick:
 
-    $ go get mumble.info/grumble
+    $ go get mumble.info/grumble/cmd/grumble
 
 And that should be it. Grumble has been built, and is available in $GOPATH/bin as 'grumble'.
diff --git a/args.go b/cmd/grumble/args.go
similarity index 100%
rename from args.go
rename to cmd/grumble/args.go
diff --git a/channel.go b/cmd/grumble/channel.go
similarity index 100%
rename from channel.go
rename to cmd/grumble/channel.go
diff --git a/client.go b/cmd/grumble/client.go
similarity index 100%
rename from client.go
rename to cmd/grumble/client.go
diff --git a/freeze.go b/cmd/grumble/freeze.go
similarity index 100%
rename from freeze.go
rename to cmd/grumble/freeze.go
diff --git a/freeze_unix.go b/cmd/grumble/freeze_unix.go
similarity index 100%
rename from freeze_unix.go
rename to cmd/grumble/freeze_unix.go
diff --git a/freeze_windows.go b/cmd/grumble/freeze_windows.go
similarity index 100%
rename from freeze_windows.go
rename to cmd/grumble/freeze_windows.go
diff --git a/gencert.go b/cmd/grumble/gencert.go
similarity index 100%
rename from gencert.go
rename to cmd/grumble/gencert.go
diff --git a/grumble.go b/cmd/grumble/grumble.go
similarity index 100%
rename from grumble.go
rename to cmd/grumble/grumble.go
diff --git a/message.go b/cmd/grumble/message.go
similarity index 100%
rename from message.go
rename to cmd/grumble/message.go
diff --git a/murmurdb.go b/cmd/grumble/murmurdb.go
similarity index 100%
rename from murmurdb.go
rename to cmd/grumble/murmurdb.go
diff --git a/register.go b/cmd/grumble/register.go
similarity index 100%
rename from register.go
rename to cmd/grumble/register.go
diff --git a/server.go b/cmd/grumble/server.go
similarity index 100%
rename from server.go
rename to cmd/grumble/server.go
diff --git a/signal_unix.go b/cmd/grumble/signal_unix.go
similarity index 100%
rename from signal_unix.go
rename to cmd/grumble/signal_unix.go
diff --git a/signal_windows.go b/cmd/grumble/signal_windows.go
similarity index 100%
rename from signal_windows.go
rename to cmd/grumble/signal_windows.go
diff --git a/user.go b/cmd/grumble/user.go
similarity index 100%
rename from user.go
rename to cmd/grumble/user.go
diff --git a/version.go b/cmd/grumble/version.go
similarity index 100%
rename from version.go
rename to cmd/grumble/version.go
diff --git a/voicetarget.go b/cmd/grumble/voicetarget.go
similarity index 100%
rename from voicetarget.go
rename to cmd/grumble/voicetarget.go