diff --git a/client/client.go b/client/client.go
index 073fe02b0b..814aed2f18 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"../future"
-	"../rcli"
+	"github.com/dotcloud/docker/future"
+	"github.com/dotcloud/docker/rcli"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/container.go b/container.go
index cda114907d..c80129e2a8 100644
--- a/container.go
+++ b/container.go
@@ -1,9 +1,9 @@
 package docker
 
 import (
-	"./fs"
 	"encoding/json"
 	"errors"
+	"github.com/dotcloud/docker/fs"
 	"github.com/kr/pty"
 	"io"
 	"io/ioutil"
diff --git a/container_test.go b/container_test.go
index d896553be8..18beeba253 100644
--- a/container_test.go
+++ b/container_test.go
@@ -1,9 +1,9 @@
 package docker
 
 import (
-	"./fs"
 	"bufio"
 	"fmt"
+	"github.com/dotcloud/docker/fs"
 	"io"
 	"io/ioutil"
 	"math/rand"
diff --git a/docker.go b/docker.go
index 49c6d83248..8e8b19082a 100644
--- a/docker.go
+++ b/docker.go
@@ -1,9 +1,9 @@
 package docker
 
 import (
-	"./fs"
 	"container/list"
 	"fmt"
+	"github.com/dotcloud/docker/fs"
 	"io/ioutil"
 	"log"
 	"os"
diff --git a/docker/docker.go b/docker/docker.go
index df8a094430..fa9011defa 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"../client"
 	"flag"
+	"github.com/dotcloud/docker/client"
 	"log"
 	"os"
 	"path"
diff --git a/docker_test.go b/docker_test.go
index 5e75906c5f..3f51e8d84c 100644
--- a/docker_test.go
+++ b/docker_test.go
@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"./fs"
+	"github.com/dotcloud/docker/fs"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/dockerd/dockerd.go b/dockerd/dockerd.go
index 22ae8df8e0..b2337d342c 100644
--- a/dockerd/dockerd.go
+++ b/dockerd/dockerd.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	".."
-	"../server"
 	"flag"
+	"github.com/dotcloud/docker"
+	"github.com/dotcloud/docker/server"
 	"log"
 )
 
diff --git a/fs/layers.go b/fs/layers.go
index 11452fcf2f..be699a8a01 100644
--- a/fs/layers.go
+++ b/fs/layers.go
@@ -1,9 +1,9 @@
 package fs
 
 import (
-	"../future"
 	"errors"
 	"fmt"
+	"github.com/dotcloud/docker/future"
 	"io"
 	"io/ioutil"
 	"os"
diff --git a/fs/layers_test.go b/fs/layers_test.go
index fa4926f542..9f8353fddb 100644
--- a/fs/layers_test.go
+++ b/fs/layers_test.go
@@ -1,7 +1,7 @@
 package fs
 
 import (
-	"../fake"
+	"github.com/dotcloud/docker/fake"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/fs/store.go b/fs/store.go
index 4f4ed368e3..36449a0fba 100644
--- a/fs/store.go
+++ b/fs/store.go
@@ -1,10 +1,10 @@
 package fs
 
 import (
-	"../future"
 	"database/sql"
 	"errors"
 	"fmt"
+	"github.com/dotcloud/docker/future"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/shykes/gorp" //Forked to implement CreateTablesOpts
 	"io"
diff --git a/fs/store_test.go b/fs/store_test.go
index d5715d1ba0..f2cc065342 100644
--- a/fs/store_test.go
+++ b/fs/store_test.go
@@ -1,9 +1,9 @@
 package fs
 
 import (
-	"../fake"
 	"errors"
 	"fmt"
+	"github.com/dotcloud/docker/fake"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/server/server.go b/server/server.go
index 4d03f58867..343458e64b 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,15 +1,15 @@
 package server
 
 import (
-	".."
-	"../fs"
-	"../future"
-	"../rcli"
 	"bufio"
 	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/dotcloud/docker"
+	"github.com/dotcloud/docker/fs"
+	"github.com/dotcloud/docker/future"
+	"github.com/dotcloud/docker/rcli"
 	"io"
 	"net/http"
 	"net/url"
@@ -60,8 +60,6 @@ func (srv *Server) Help() string {
 		{"mirror", "(debug only) (No documentation available)"},
 		{"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"},
 		{"ps", "List containers"},
-		{"pull", "Download a new image from a remote location"},
-		{"put", "Import a new image from a local archive"},
 		{"reset", "Reset changes to a container's filesystem"},
 		{"restart", "Restart a running container"},
 		{"rm", "Remove a container"},
diff --git a/state.go b/state.go
index 6b753ce830..e864f304f9 100644
--- a/state.go
+++ b/state.go
@@ -1,8 +1,8 @@
 package docker
 
 import (
-	"./future"
 	"fmt"
+	"github.com/dotcloud/docker/future"
 	"sync"
 	"time"
 )