diff --git a/util/addblock/addblock.go b/cmd/addblock/addblock.go
similarity index 100%
rename from util/addblock/addblock.go
rename to cmd/addblock/addblock.go
diff --git a/util/addblock/config.go b/cmd/addblock/config.go
similarity index 100%
rename from util/addblock/config.go
rename to cmd/addblock/config.go
diff --git a/util/addblock/import.go b/cmd/addblock/import.go
similarity index 100%
rename from util/addblock/import.go
rename to cmd/addblock/import.go
diff --git a/util/btcctl/btcctl.go b/cmd/btcctl/btcctl.go
similarity index 100%
rename from util/btcctl/btcctl.go
rename to cmd/btcctl/btcctl.go
diff --git a/util/btcctl/config.go b/cmd/btcctl/config.go
similarity index 100%
rename from util/btcctl/config.go
rename to cmd/btcctl/config.go
diff --git a/util/btcctl/version.go b/cmd/btcctl/version.go
similarity index 100%
rename from util/btcctl/version.go
rename to cmd/btcctl/version.go
diff --git a/util/dropafter/dropafter.go b/cmd/dropafter/dropafter.go
similarity index 100%
rename from util/dropafter/dropafter.go
rename to cmd/dropafter/dropafter.go
diff --git a/util/findcheckpoint/config.go b/cmd/findcheckpoint/config.go
similarity index 100%
rename from util/findcheckpoint/config.go
rename to cmd/findcheckpoint/config.go
diff --git a/util/findcheckpoint/findcheckpoint.go b/cmd/findcheckpoint/findcheckpoint.go
similarity index 100%
rename from util/findcheckpoint/findcheckpoint.go
rename to cmd/findcheckpoint/findcheckpoint.go
diff --git a/util/gencerts/gencerts.go b/cmd/gencerts/gencerts.go
similarity index 100%
rename from util/gencerts/gencerts.go
rename to cmd/gencerts/gencerts.go
diff --git a/util/showblock/showblock.go b/cmd/showblock/showblock.go
similarity index 100%
rename from util/showblock/showblock.go
rename to cmd/showblock/showblock.go