diff --git a/cli/.gitignore b/cmd/ipfs/.gitignore
similarity index 100%
rename from cli/.gitignore
rename to cmd/ipfs/.gitignore
diff --git a/cli/Makefile b/cmd/ipfs/Makefile
similarity index 100%
rename from cli/Makefile
rename to cmd/ipfs/Makefile
diff --git a/cli/add.go b/cmd/ipfs/add.go
similarity index 100%
rename from cli/add.go
rename to cmd/ipfs/add.go
diff --git a/cli/cat.go b/cmd/ipfs/cat.go
similarity index 100%
rename from cli/cat.go
rename to cmd/ipfs/cat.go
diff --git a/cli/commands.go b/cmd/ipfs/commands.go
similarity index 100%
rename from cli/commands.go
rename to cmd/ipfs/commands.go
diff --git a/cli/ipfs.go b/cmd/ipfs/ipfs.go
similarity index 100%
rename from cli/ipfs.go
rename to cmd/ipfs/ipfs.go
diff --git a/cli/ls.go b/cmd/ipfs/ls.go
similarity index 100%
rename from cli/ls.go
rename to cmd/ipfs/ls.go
diff --git a/cli/mount.go b/cmd/ipfs/mount.go
similarity index 100%
rename from cli/mount.go
rename to cmd/ipfs/mount.go
diff --git a/cli/refs.go b/cmd/ipfs/refs.go
similarity index 100%
rename from cli/refs.go
rename to cmd/ipfs/refs.go
diff --git a/cli/version.go b/cmd/ipfs/version.go
similarity index 100%
rename from cli/version.go
rename to cmd/ipfs/version.go