diff --git a/cmd/cadvisor.go b/cmd/cadvisor.go
index c4a6ff78..e536bca0 100644
--- a/cmd/cadvisor.go
+++ b/cmd/cadvisor.go
@@ -35,7 +35,7 @@ import (
 	"github.com/google/cadvisor/version"
 
 	// Register container providers
-	_ "github.com/google/cadvisor/container/install"
+	_ "github.com/google/cadvisor/cmd/internal/container/install"
 
 	// Register CloudProviders
 	_ "github.com/google/cadvisor/utils/cloudinfo/aws"
diff --git a/container/install/install.go b/cmd/internal/container/install/install.go
similarity index 93%
rename from container/install/install.go
rename to cmd/internal/container/install/install.go
index 38e94ac1..ec0dd0bc 100644
--- a/container/install/install.go
+++ b/cmd/internal/container/install/install.go
@@ -16,9 +16,9 @@
 package install
 
 import (
+	_ "github.com/google/cadvisor/cmd/internal/container/mesos/install"
 	_ "github.com/google/cadvisor/container/containerd/install"
 	_ "github.com/google/cadvisor/container/crio/install"
 	_ "github.com/google/cadvisor/container/docker/install"
-	_ "github.com/google/cadvisor/container/mesos/install"
 	_ "github.com/google/cadvisor/container/systemd/install"
 )
diff --git a/container/mesos/client.go b/cmd/internal/container/mesos/client.go
similarity index 100%
rename from container/mesos/client.go
rename to cmd/internal/container/mesos/client.go
diff --git a/container/mesos/client_test.go b/cmd/internal/container/mesos/client_test.go
similarity index 100%
rename from container/mesos/client_test.go
rename to cmd/internal/container/mesos/client_test.go
diff --git a/container/mesos/factory.go b/cmd/internal/container/mesos/factory.go
similarity index 100%
rename from container/mesos/factory.go
rename to cmd/internal/container/mesos/factory.go
diff --git a/container/mesos/factory_test.go b/cmd/internal/container/mesos/factory_test.go
similarity index 100%
rename from container/mesos/factory_test.go
rename to cmd/internal/container/mesos/factory_test.go
diff --git a/container/mesos/handler.go b/cmd/internal/container/mesos/handler.go
similarity index 100%
rename from container/mesos/handler.go
rename to cmd/internal/container/mesos/handler.go
diff --git a/container/mesos/handler_test.go b/cmd/internal/container/mesos/handler_test.go
similarity index 100%
rename from container/mesos/handler_test.go
rename to cmd/internal/container/mesos/handler_test.go
diff --git a/container/mesos/install/install.go b/cmd/internal/container/mesos/install/install.go
similarity index 94%
rename from container/mesos/install/install.go
rename to cmd/internal/container/mesos/install/install.go
index 4b9f211e..be123f43 100644
--- a/container/mesos/install/install.go
+++ b/cmd/internal/container/mesos/install/install.go
@@ -16,8 +16,8 @@
 package install
 
 import (
+	"github.com/google/cadvisor/cmd/internal/container/mesos"
 	"github.com/google/cadvisor/container"
-	"github.com/google/cadvisor/container/mesos"
 	"k8s.io/klog"
 )
 
diff --git a/container/mesos/mesos_agent.go b/cmd/internal/container/mesos/mesos_agent.go
similarity index 100%
rename from container/mesos/mesos_agent.go
rename to cmd/internal/container/mesos/mesos_agent.go
diff --git a/container/mesos/mesos_agent_test.go b/cmd/internal/container/mesos/mesos_agent_test.go
similarity index 100%
rename from container/mesos/mesos_agent_test.go
rename to cmd/internal/container/mesos/mesos_agent_test.go
diff --git a/container/mesos/plugin.go b/cmd/internal/container/mesos/plugin.go
similarity index 100%
rename from container/mesos/plugin.go
rename to cmd/internal/container/mesos/plugin.go
diff --git a/storage/bigquery/README.md b/cmd/internal/storage/bigquery/README.md
similarity index 100%
rename from storage/bigquery/README.md
rename to cmd/internal/storage/bigquery/README.md
diff --git a/storage/bigquery/bigquery.go b/cmd/internal/storage/bigquery/bigquery.go
similarity index 99%
rename from storage/bigquery/bigquery.go
rename to cmd/internal/storage/bigquery/bigquery.go
index d4675737..850ab8ae 100644
--- a/storage/bigquery/bigquery.go
+++ b/cmd/internal/storage/bigquery/bigquery.go
@@ -17,9 +17,9 @@ package bigquery
 import (
 	"os"
 
+	"github.com/google/cadvisor/cmd/internal/storage/bigquery/client"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/storage"
-	"github.com/google/cadvisor/storage/bigquery/client"
 
 	bigquery "google.golang.org/api/bigquery/v2"
 )
diff --git a/storage/bigquery/client/client.go b/cmd/internal/storage/bigquery/client/client.go
similarity index 100%
rename from storage/bigquery/client/client.go
rename to cmd/internal/storage/bigquery/client/client.go
diff --git a/storage/bigquery/client/example/example.go b/cmd/internal/storage/bigquery/client/example/example.go
similarity index 97%
rename from storage/bigquery/client/example/example.go
rename to cmd/internal/storage/bigquery/client/example/example.go
index f21ad0b7..d3452a1c 100644
--- a/storage/bigquery/client/example/example.go
+++ b/cmd/internal/storage/bigquery/client/example/example.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/SeanDolphin/bqschema"
-	"github.com/google/cadvisor/storage/bigquery/client"
+	"github.com/google/cadvisor/cmd/internal/storage/bigquery/client"
 )
 
 type container struct {
diff --git a/storage/elasticsearch/elasticsearch.go b/cmd/internal/storage/elasticsearch/elasticsearch.go
similarity index 100%
rename from storage/elasticsearch/elasticsearch.go
rename to cmd/internal/storage/elasticsearch/elasticsearch.go
diff --git a/storage/influxdb/influxdb.go b/cmd/internal/storage/influxdb/influxdb.go
similarity index 100%
rename from storage/influxdb/influxdb.go
rename to cmd/internal/storage/influxdb/influxdb.go
diff --git a/storage/influxdb/influxdb_test.go b/cmd/internal/storage/influxdb/influxdb_test.go
similarity index 99%
rename from storage/influxdb/influxdb_test.go
rename to cmd/internal/storage/influxdb/influxdb_test.go
index 8704d083..01aa5882 100644
--- a/storage/influxdb/influxdb_test.go
+++ b/cmd/internal/storage/influxdb/influxdb_test.go
@@ -25,9 +25,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/cadvisor/cmd/internal/storage/test"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/storage"
-	"github.com/google/cadvisor/storage/test"
 
 	influxdb "github.com/influxdb/influxdb/client"
 	"github.com/stretchr/testify/assert"
diff --git a/storage/kafka/kafka.go b/cmd/internal/storage/kafka/kafka.go
similarity index 100%
rename from storage/kafka/kafka.go
rename to cmd/internal/storage/kafka/kafka.go
diff --git a/storage/redis/redis.go b/cmd/internal/storage/redis/redis.go
similarity index 100%
rename from storage/redis/redis.go
rename to cmd/internal/storage/redis/redis.go
diff --git a/storage/statsd/client/client.go b/cmd/internal/storage/statsd/client/client.go
similarity index 100%
rename from storage/statsd/client/client.go
rename to cmd/internal/storage/statsd/client/client.go
diff --git a/storage/statsd/statsd.go b/cmd/internal/storage/statsd/statsd.go
similarity index 98%
rename from storage/statsd/statsd.go
rename to cmd/internal/storage/statsd/statsd.go
index db665bda..e15794bc 100644
--- a/storage/statsd/statsd.go
+++ b/cmd/internal/storage/statsd/statsd.go
@@ -15,9 +15,9 @@
 package statsd
 
 import (
+	client "github.com/google/cadvisor/cmd/internal/storage/statsd/client"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/storage"
-	client "github.com/google/cadvisor/storage/statsd/client"
 )
 
 func init() {
diff --git a/storage/stdout/stdout.go b/cmd/internal/storage/stdout/stdout.go
similarity index 100%
rename from storage/stdout/stdout.go
rename to cmd/internal/storage/stdout/stdout.go
diff --git a/storage/test/mock.go b/cmd/internal/storage/test/mock.go
similarity index 100%
rename from storage/test/mock.go
rename to cmd/internal/storage/test/mock.go
diff --git a/storage/test/storagetests.go b/cmd/internal/storage/test/storagetests.go
similarity index 100%
rename from storage/test/storagetests.go
rename to cmd/internal/storage/test/storagetests.go
diff --git a/cmd/storagedriver.go b/cmd/storagedriver.go
index 60c12261..b7825fb9 100644
--- a/cmd/storagedriver.go
+++ b/cmd/storagedriver.go
@@ -21,14 +21,14 @@ import (
 	"time"
 
 	"github.com/google/cadvisor/cache/memory"
+	_ "github.com/google/cadvisor/cmd/internal/storage/bigquery"
+	_ "github.com/google/cadvisor/cmd/internal/storage/elasticsearch"
+	_ "github.com/google/cadvisor/cmd/internal/storage/influxdb"
+	_ "github.com/google/cadvisor/cmd/internal/storage/kafka"
+	_ "github.com/google/cadvisor/cmd/internal/storage/redis"
+	_ "github.com/google/cadvisor/cmd/internal/storage/statsd"
+	_ "github.com/google/cadvisor/cmd/internal/storage/stdout"
 	"github.com/google/cadvisor/storage"
-	_ "github.com/google/cadvisor/storage/bigquery"
-	_ "github.com/google/cadvisor/storage/elasticsearch"
-	_ "github.com/google/cadvisor/storage/influxdb"
-	_ "github.com/google/cadvisor/storage/kafka"
-	_ "github.com/google/cadvisor/storage/redis"
-	_ "github.com/google/cadvisor/storage/statsd"
-	_ "github.com/google/cadvisor/storage/stdout"
 
 	"k8s.io/klog"
 )
diff --git a/manager/manager_test.go b/manager/manager_test.go
index cdf00e17..3ad0c533 100644
--- a/manager/manager_test.go
+++ b/manager/manager_test.go
@@ -36,7 +36,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	clock "k8s.io/utils/clock/testing"
 
-	_ "github.com/google/cadvisor/container/install"
+	// install all the container runtimes included in the library version for testing.
+	// as these are moved to cmd/internal/container, remove them from here.
+	_ "github.com/google/cadvisor/container/containerd/install"
+	_ "github.com/google/cadvisor/container/crio/install"
+	_ "github.com/google/cadvisor/container/docker/install"
+	_ "github.com/google/cadvisor/container/systemd/install"
 )
 
 // TODO(vmarmol): Refactor these tests.