diff --git a/main_linux.go b/init.go
similarity index 100%
rename from main_linux.go
rename to init.go
diff --git a/main_solaris.go b/main_solaris.go
deleted file mode 100644
index d52e8ca72..000000000
--- a/main_solaris.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package main
-
-import "github.com/urfave/cli"
-
-var (
-	checkpointCommand cli.Command
-	eventsCommand     cli.Command
-	restoreCommand    cli.Command
-	specCommand       cli.Command
-	killCommand       cli.Command
-	deleteCommand     cli.Command
-	execCommand       cli.Command
-	initCommand       cli.Command
-	listCommand       cli.Command
-	pauseCommand      cli.Command
-	resumeCommand     cli.Command
-	startCommand      cli.Command
-	stateCommand      cli.Command
-)
diff --git a/main_unsupported.go b/main_unsupported.go
deleted file mode 100644
index 4d69931a6..000000000
--- a/main_unsupported.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !linux,!solaris
-
-package main
-
-import "github.com/urfave/cli"
-
-var (
-	checkpointCommand cli.Command
-	eventsCommand     cli.Command
-	restoreCommand    cli.Command
-	specCommand       cli.Command
-	killCommand       cli.Command
-)