switch projectatomic to containers

Need to get some small changes into libpod to pull back into buildah
to complete buildah transition.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #1270
Approved by: mheon

61 files changed, 138 insertions, 138 deletions

diff --git a/cmd/podman/attach.go b/cmd/podman/attach.go
index f615ce026..91c5f654d 100644
--- a/cmd/podman/attach.go
+++ b/cmd/podman/attach.go
@@ -3,9 +3,9 @@ package main
 import (
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/batchcontainer/container.go b/cmd/podman/batchcontainer/container.go
index e27914174..364b28d40 100644
--- a/cmd/podman/batchcontainer/container.go
+++ b/cmd/podman/batchcontainer/container.go
@@ -9,11 +9,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/inspect"
+	cc "github.com/containers/libpod/pkg/spec"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	cc "github.com/projectatomic/libpod/pkg/spec"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index c33193882..e35fd10a4 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -6,13 +6,13 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/projectatomic/buildah"
 	"github.com/projectatomic/buildah/imagebuildah"
 	buildahcli "github.com/projectatomic/buildah/pkg/cli"
 	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/pkg/rootless"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/cleanup.go b/cmd/podman/cleanup.go
index 33b0fad45..a71b3f48a 100644
--- a/cmd/podman/cleanup.go
+++ b/cmd/podman/cleanup.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go
index 8d3c124bf..03210dc35 100644
--- a/cmd/podman/commit.go
+++ b/cmd/podman/commit.go
@@ -7,12 +7,12 @@ import (
 	"strings"
 
 	"github.com/containers/image/manifest"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 93fa9653a..8ce3066c0 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -6,10 +6,10 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/containers/storage"
 	"github.com/fatih/camelcase"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index ad6f53b55..96934560f 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -9,21 +9,21 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
+	ann "github.com/containers/libpod/pkg/annotations"
+	"github.com/containers/libpod/pkg/apparmor"
+	"github.com/containers/libpod/pkg/inspect"
+	cc "github.com/containers/libpod/pkg/spec"
+	"github.com/containers/libpod/pkg/util"
+	libpodVersion "github.com/containers/libpod/version"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/image"
-	ann "github.com/projectatomic/libpod/pkg/annotations"
-	"github.com/projectatomic/libpod/pkg/apparmor"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	cc "github.com/projectatomic/libpod/pkg/spec"
-	"github.com/projectatomic/libpod/pkg/util"
-	libpodVersion "github.com/projectatomic/libpod/version"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/create_cli.go b/cmd/podman/create_cli.go
index d0ad28595..812b62058 100644
--- a/cmd/podman/create_cli.go
+++ b/cmd/podman/create_cli.go
@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	cc "github.com/containers/libpod/pkg/spec"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/pkg/errors"
-	cc "github.com/projectatomic/libpod/pkg/spec"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go
index 9dca25050..f5a2d60ad 100644
--- a/cmd/podman/diff.go
+++ b/cmd/podman/diff.go
@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go
index a42cdf63a..17a17f703 100644
--- a/cmd/podman/exec.go
+++ b/cmd/podman/exec.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/export.go b/cmd/podman/export.go
index 16c1f5c9b..20faac7d8 100644
--- a/cmd/podman/export.go
+++ b/cmd/podman/export.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/formats/formats_test.go b/cmd/podman/formats/formats_test.go
index fc7f01f93..c75109d65 100644
--- a/cmd/podman/formats/formats_test.go
+++ b/cmd/podman/formats/formats_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/projectatomic/libpod/pkg/inspect"
+	"github.com/containers/libpod/pkg/inspect"
 )
 
 func TestSetJSONFormatEncoder(t *testing.T) {
diff --git a/cmd/podman/history.go b/cmd/podman/history.go
index 2570dcc7d..2ae0dff66 100644
--- a/cmd/podman/history.go
+++ b/cmd/podman/history.go
@@ -6,11 +6,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
 	units "github.com/docker/go-units"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index 364c8a91c..024b6e240 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/sirupsen/logrus"
 
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
 	"github.com/docker/go-units"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/import.go b/cmd/podman/import.go
index 8a50d4fb9..4f7786c42 100644
--- a/cmd/podman/import.go
+++ b/cmd/podman/import.go
@@ -8,11 +8,11 @@ import (
 	"net/url"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/info.go b/cmd/podman/info.go
index f03d23c5b..cd66943a4 100644
--- a/cmd/podman/info.go
+++ b/cmd/podman/info.go
@@ -3,10 +3,10 @@ package main
 import (
 	"runtime"
 
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go
index 6aaf9b694..1fa8f55a2 100644
--- a/cmd/podman/inspect.go
+++ b/cmd/podman/inspect.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/batchcontainer"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/batchcontainer"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/kill.go b/cmd/podman/kill.go
index 99e111177..388c779f6 100644
--- a/cmd/podman/kill.go
+++ b/cmd/podman/kill.go
@@ -5,9 +5,9 @@ import (
 	"syscall"
 
 	"fmt"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
index f1f2b963c..e33b70e9a 100644
--- a/cmd/podman/libpodruntime/runtime.go
+++ b/cmd/podman/libpodruntime/runtime.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/rootless"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/load.go b/cmd/podman/load.go
index ffef9f6a6..fbc1f3cd0 100644
--- a/cmd/podman/load.go
+++ b/cmd/podman/load.go
@@ -9,9 +9,9 @@ import (
 	"github.com/containers/image/directory"
 	dockerarchive "github.com/containers/image/docker/archive"
 	ociarchive "github.com/containers/image/oci/archive"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/login.go b/cmd/podman/login.go
index 113760318..92417e1a1 100644
--- a/cmd/podman/login.go
+++ b/cmd/podman/login.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/containers/image/docker"
 	"github.com/containers/image/pkg/docker/config"
+	"github.com/containers/libpod/libpod/common"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod/common"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
 )
diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go
index c06c69073..97631f827 100644
--- a/cmd/podman/logout.go
+++ b/cmd/podman/logout.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/containers/image/pkg/docker/config"
+	"github.com/containers/libpod/libpod/common"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod/common"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/logs.go b/cmd/podman/logs.go
index 26ca2330f..67ec038c3 100644
--- a/cmd/podman/logs.go
+++ b/cmd/podman/logs.go
@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"bufio"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 7a669b3fe..e72998c8f 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -7,12 +7,12 @@ import (
 	"runtime/pprof"
 	"syscall"
 
+	"github.com/containers/libpod/pkg/hooks"
+	_ "github.com/containers/libpod/pkg/hooks/0.1.0"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/version"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/pkg/hooks"
-	_ "github.com/projectatomic/libpod/pkg/hooks/0.1.0"
-	"github.com/projectatomic/libpod/pkg/rootless"
-	"github.com/projectatomic/libpod/version"
 	"github.com/sirupsen/logrus"
 	lsyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"github.com/urfave/cli"
diff --git a/cmd/podman/mount.go b/cmd/podman/mount.go
index df1bacc5f..6cda9dbd3 100644
--- a/cmd/podman/mount.go
+++ b/cmd/podman/mount.go
@@ -4,9 +4,9 @@ import (
 	js "encoding/json"
 	"fmt"
 
+	of "github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	of "github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/pause.go b/cmd/podman/pause.go
index f97a1c61b..12ff747a7 100644
--- a/cmd/podman/pause.go
+++ b/cmd/podman/pause.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/pod_create.go b/cmd/podman/pod_create.go
index c14496f5a..568ace6e7 100644
--- a/cmd/podman/pod_create.go
+++ b/cmd/podman/pod_create.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/pod_inspect.go b/cmd/podman/pod_inspect.go
index 6935335a6..1370c9471 100644
--- a/cmd/podman/pod_inspect.go
+++ b/cmd/podman/pod_inspect.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 
 	"fmt"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/pod_kill.go b/cmd/podman/pod_kill.go
index 48f4eaa7a..3cd9bf7c9 100644
--- a/cmd/podman/pod_kill.go
+++ b/cmd/podman/pod_kill.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"syscall"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/pod_pause.go b/cmd/podman/pod_pause.go
index df51a037b..0e2e797f5 100644
--- a/cmd/podman/pod_pause.go
+++ b/cmd/podman/pod_pause.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/pod_ps.go b/cmd/podman/pod_ps.go
index 0f5c7a51d..1c030f266 100644
--- a/cmd/podman/pod_ps.go
+++ b/cmd/podman/pod_ps.go
@@ -7,13 +7,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/batchcontainer"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/batchcontainer"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/pod_restart.go b/cmd/podman/pod_restart.go
index fe802fc9d..62e93b316 100644
--- a/cmd/podman/pod_restart.go
+++ b/cmd/podman/pod_restart.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/pod_rm.go b/cmd/podman/pod_rm.go
index 983203374..549fa0290 100644
--- a/cmd/podman/pod_rm.go
+++ b/cmd/podman/pod_rm.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/pod_start.go b/cmd/podman/pod_start.go
index e35ec7993..b6ba5719b 100644
--- a/cmd/podman/pod_start.go
+++ b/cmd/podman/pod_start.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/pod_stop.go b/cmd/podman/pod_stop.go
index 97d248b30..ac6781408 100644
--- a/cmd/podman/pod_stop.go
+++ b/cmd/podman/pod_stop.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/pod_unpause.go b/cmd/podman/pod_unpause.go
index 5dd5c79e4..d599baba9 100644
--- a/cmd/podman/pod_unpause.go
+++ b/cmd/podman/pod_unpause.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/port.go b/cmd/podman/port.go
index 9082ec25d..e3933f925 100644
--- a/cmd/podman/port.go
+++ b/cmd/podman/port.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index a5f862f8f..94e8a4920 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -8,14 +8,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/batchcontainer"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/batchcontainer"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"k8s.io/apimachinery/pkg/fields"
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go
index a1d685735..f1666113b 100644
--- a/cmd/podman/pull.go
+++ b/cmd/podman/pull.go
@@ -9,10 +9,10 @@ import (
 	dockerarchive "github.com/containers/image/docker/archive"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	image2 "github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	image2 "github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/push.go b/cmd/podman/push.go
index 3c2e59e58..79758257a 100644
--- a/cmd/podman/push.go
+++ b/cmd/podman/push.go
@@ -9,11 +9,11 @@ import (
 	"github.com/containers/image/directory"
 	"github.com/containers/image/manifest"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/util"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/refresh.go b/cmd/podman/refresh.go
index 8a1cee717..8e4fd9ae9 100644
--- a/cmd/podman/refresh.go
+++ b/cmd/podman/refresh.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/restart.go b/cmd/podman/restart.go
index 08e8b615b..89484f895 100644
--- a/cmd/podman/restart.go
+++ b/cmd/podman/restart.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go
index c0ec7d9f6..1d580ac7e 100644
--- a/cmd/podman/rm.go
+++ b/cmd/podman/rm.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go
index 95e98a038..c1c3869c8 100644
--- a/cmd/podman/rmi.go
+++ b/cmd/podman/rmi.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/image"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/urfave/cli"
 )
 
@@ -97,7 +97,7 @@ func rmiCmd(c *cli.Context) error {
 		// Note that we have to query the storage one-by-one to
 		// always get the latest state for each image.  Otherwise, we
 		// run inconsistency issues, for instance, with repoTags.
-		// See https://github.com/projectatomic/libpod/issues/930 as
+		// See https://github.com/containers/libpod/issues/930 as
 		// an exemplary inconsistency issue.
 		for _, i := range images {
 			newImage, err := runtime.ImageRuntime().NewFromLocal(i)
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index efc7f2dd0..997068a55 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -9,13 +9,13 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/inspect"
+	cc "github.com/containers/libpod/pkg/spec"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/image"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	cc "github.com/projectatomic/libpod/pkg/spec"
-	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/run_test.go b/cmd/podman/run_test.go
index a421c4a20..397b3bb71 100644
--- a/cmd/podman/run_test.go
+++ b/cmd/podman/run_test.go
@@ -4,11 +4,11 @@ import (
 	"runtime"
 	"testing"
 
+	"github.com/containers/libpod/pkg/inspect"
+	cc "github.com/containers/libpod/pkg/spec"
 	units "github.com/docker/go-units"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/projectatomic/libpod/pkg/inspect"
-	cc "github.com/projectatomic/libpod/pkg/spec"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/save.go b/cmd/podman/save.go
index f5fd421a4..8186718d4 100644
--- a/cmd/podman/save.go
+++ b/cmd/podman/save.go
@@ -12,10 +12,10 @@ import (
 	"github.com/containers/image/manifest"
 	ociarchive "github.com/containers/image/oci/archive"
 	"github.com/containers/image/types"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	libpodImage "github.com/containers/libpod/libpod/image"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	libpodImage "github.com/projectatomic/libpod/libpod/image"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/search.go b/cmd/podman/search.go
index d71432fc6..cc18cd1de 100644
--- a/cmd/podman/search.go
+++ b/cmd/podman/search.go
@@ -7,12 +7,12 @@ import (
 	"strings"
 
 	"github.com/containers/image/docker"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/common"
+	sysreg "github.com/containers/libpod/pkg/registries"
 	"github.com/docker/distribution/reference"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod/common"
-	sysreg "github.com/projectatomic/libpod/pkg/registries"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/sigproxy.go b/cmd/podman/sigproxy.go
index 388e23439..16861bad0 100644
--- a/cmd/podman/sigproxy.go
+++ b/cmd/podman/sigproxy.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"syscall"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/docker/docker/pkg/signal"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/cmd/podman/start.go b/cmd/podman/start.go
index 3dde306d7..f0f205892 100644
--- a/cmd/podman/start.go
+++ b/cmd/podman/start.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/stats.go b/cmd/podman/stats.go
index d1015801f..cb89b8a9d 100644
--- a/cmd/podman/stats.go
+++ b/cmd/podman/stats.go
@@ -7,11 +7,11 @@ import (
 	"time"
 
 	tm "github.com/buger/goterm"
+	"github.com/containers/libpod/cmd/podman/formats"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/formats"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/stop.go b/cmd/podman/stop.go
index 820d1acb2..d1fae56dd 100644
--- a/cmd/podman/stop.go
+++ b/cmd/podman/stop.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/tag.go b/cmd/podman/tag.go
index d1d1693a3..5c81fe7f8 100644
--- a/cmd/podman/tag.go
+++ b/cmd/podman/tag.go
@@ -1,8 +1,8 @@
 package main
 
 import (
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/top.go b/cmd/podman/top.go
index 7db71ab16..43728893c 100644
--- a/cmd/podman/top.go
+++ b/cmd/podman/top.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"text/tabwriter"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/umount.go b/cmd/podman/umount.go
index 1e364b48f..33556b2ea 100644
--- a/cmd/podman/umount.go
+++ b/cmd/podman/umount.go
@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/podman/unpause.go b/cmd/podman/unpause.go
index 6571dff4e..d0c622b8a 100644
--- a/cmd/podman/unpause.go
+++ b/cmd/podman/unpause.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go
index 2d19e312c..89ec48dbe 100644
--- a/cmd/podman/utils.go
+++ b/cmd/podman/utils.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	gosignal "os/signal"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/term"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
diff --git a/cmd/podman/varlink.go b/cmd/podman/varlink.go
index 71cf86c74..4e6d76c7e 100644
--- a/cmd/podman/varlink.go
+++ b/cmd/podman/varlink.go
@@ -5,11 +5,11 @@ package main
 import (
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	iopodman "github.com/containers/libpod/cmd/podman/varlink"
+	"github.com/containers/libpod/pkg/varlinkapi"
+	"github.com/containers/libpod/version"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	iopodman "github.com/projectatomic/libpod/cmd/podman/varlink"
-	"github.com/projectatomic/libpod/pkg/varlinkapi"
-	"github.com/projectatomic/libpod/version"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"github.com/varlink/go/varlink"
@@ -59,7 +59,7 @@ func varlinkCmd(c *cli.Context) error {
 		"Atomic",
 		"podman",
 		version.Version,
-		"https://github.com/projectatomic/libpod",
+		"https://github.com/containers/libpod",
 	)
 	if err != nil {
 		return errors.Wrapf(err, "unable to create new varlink service")
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index 2cc381c5a..263f38494 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -1,5 +1,5 @@
 # Podman Service Interface and API description.  The master version of this document can be found
-# in the [API.md](https://github.com/projectatomic/libpod/blob/master/API.md) file in the upstream libpod repository.
+# in the [API.md](https://github.com/containers/libpod/blob/master/API.md) file in the upstream libpod repository.
 interface io.podman
 
 
diff --git a/cmd/podman/version.go b/cmd/podman/version.go
index 952cf32d3..f896229c4 100644
--- a/cmd/podman/version.go
+++ b/cmd/podman/version.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/podman/wait.go b/cmd/podman/wait.go
index 142e0e599..929b66761 100644
--- a/cmd/podman/wait.go
+++ b/cmd/podman/wait.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/urfave/cli"
 )