diff --git a/client/client.go b/client/client.go
index 815e20a04832a6b619552e562aefe712bc55c90c..30d741f8bddddd07089bcb8a837ff49588a0d8f0 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"
 	"log"
 	"os"
diff --git a/container.go b/container.go
index cda114907d010b9b700f5f2f78fb609f0ea9c643..c80129e2a814535b23550183808c202e78a4033f 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 d896553be808cc143ed6791f8c606b153506220a..18beeba253d146da61671980570621757494114a 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 49c6d832484cafbb9cd3650126b353dfc0e87552..8e8b19082a09ae6dfd92b62c5fccce3660803043 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 b43d5b1053c5bd5aa3fd1b081e81c6e2a9c53fc9..29a550c7b491ab2015a234dd1350b86436b4b8d0 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"../client"
+	"github.com/dotcloud/docker/client"
 	"log"
 	"os"
 )
diff --git a/docker_test.go b/docker_test.go
index 5e75906c5fe6b51f3fe898939379d982b7e8ef3f..3f51e8d84cad3e93012fee2d2bca018de8c6ea43 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 22ae8df8e0a881173f275f8339c9ec2f6338bb3e..b2337d342cf9dc4efb136772705a1c34f4ff55a7 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 11452fcf2fdef98864ea25cdd2360092cb44ae03..be699a8a01363b584d4f32f4e4989a8bf42c84bc 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 fa4926f542c86719a69754f90af0b349b3367e28..9f8353fddb16567d02690c627ea6f43113d17013 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 4f4ed368e313a02ff808255138fcf3461f8019ab..36449a0fba93d313997963b80de611b57b73c4e7 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 d5715d1ba0d049fa7f5c78825e324a1e0ec7c887..f2cc065342c6bd61f53c64dd67c0fb9015592c0b 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 94a08a9bf4e0a6b64cc9e58a9dea8f5b3aacb332..18dc5781905af836e4308dee0926f4f99f8f5b25 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"},
@@ -71,6 +69,7 @@ func (srv *Server) Help() string {
 		{"stop", "Stop a running container"},
 		{"tar", "Stream the contents of a container as a tar archive"},
 		{"umount", "(debug only) Mount a container's filesystem"},
+		{"version", "Show the docker version information"},
 		{"wait", "Block until a container stops, then print its exit code"},
 		{"web", "A web UI for docker"},
 		{"write", "Write the contents of standard input to a container's file"},
@@ -100,20 +99,33 @@ func (srv *Server) CmdWait(stdin io.ReadCloser, stdout io.Writer, args ...string
 	return nil
 }
 
+// 'docker version': show version information
+func (srv *Server) CmdVersion(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
+	fmt.Fprintf(stdout, "Version:%s\n", VERSION)
+	return nil
+}
+
 // 'docker info': display system-wide information.
 func (srv *Server) CmdInfo(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
+	images, _ := srv.images.Images()
+	var imgcount int
+	if images == nil {
+		imgcount = 0
+	} else {
+		imgcount = len(images)
+	}
 	cmd := rcli.Subcmd(stdout, "info", "", "Display system-wide information.")
 	if err := cmd.Parse(args); err != nil {
 		return nil
 	}
-	if cmd.NArg() > 1 {
+	if cmd.NArg() > 0 {
 		cmd.Usage()
 		return nil
 	}
 	fmt.Fprintf(stdout, "containers: %d\nversion: %s\nimages: %d\n",
 		len(srv.containers.List()),
 		VERSION,
-		len(srv.images.ById))
+		imgcount)
 	return nil
 }
 
@@ -732,10 +744,17 @@ func (srv *Server) CmdLogs(stdin io.ReadCloser, stdout io.Writer, args ...string
 	return errors.New("No such container: " + cmd.Arg(0))
 }
 
-func (srv *Server) CreateContainer(img *fs.Image, ports []int, user string, tty bool, openStdin bool, comment string, cmd string, args ...string) (*docker.Container, error) {
+func (srv *Server) CreateContainer(img *fs.Image, ports []int, user string, tty bool, openStdin bool, memory int64, comment string, cmd string, args ...string) (*docker.Container, error) {
 	id := future.RandomId()[:8]
 	container, err := srv.containers.Create(id, cmd, args, img,
-		&docker.Config{Hostname: id, Ports: ports, User: user, Tty: tty, OpenStdin: openStdin})
+		&docker.Config{
+			Hostname:  id,
+			Ports:     ports,
+			User:      user,
+			Tty:       tty,
+			OpenStdin: openStdin,
+			Memory:    memory,
+		})
 	if err != nil {
 		return nil, err
 	}
diff --git a/state.go b/state.go
index 6b753ce8308beca3e0359ab257a9351f490718f8..e864f304f9adb04c6873ec8a613e3b2b88b719d4 100644
--- a/state.go
+++ b/state.go
@@ -1,8 +1,8 @@
 package docker
 
 import (
-	"./future"
 	"fmt"
+	"github.com/dotcloud/docker/future"
 	"sync"
 	"time"
 )