diff --git a/app-graceful.go b/cmd/gate/app-graceful.go
similarity index 100%
rename from app-graceful.go
rename to cmd/gate/app-graceful.go
diff --git a/app-healthy.go b/cmd/gate/app-healthy.go
similarity index 100%
rename from app-healthy.go
rename to cmd/gate/app-healthy.go
diff --git a/app-logger.go b/cmd/gate/app-logger.go
similarity index 100%
rename from app-logger.go
rename to cmd/gate/app-logger.go
diff --git a/app-metrics.go b/cmd/gate/app-metrics.go
similarity index 100%
rename from app-metrics.go
rename to cmd/gate/app-metrics.go
diff --git a/app-profiler.go b/cmd/gate/app-profiler.go
similarity index 100%
rename from app-profiler.go
rename to cmd/gate/app-profiler.go
diff --git a/app-settings.go b/cmd/gate/app-settings.go
similarity index 100%
rename from app-settings.go
rename to cmd/gate/app-settings.go
diff --git a/app.go b/cmd/gate/app.go
similarity index 98%
rename from app.go
rename to cmd/gate/app.go
index 7ef0090..ec6ebe4 100644
--- a/app.go
+++ b/cmd/gate/app.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	minio "github.com/minio/minio/cmd"
+	minio "github.com/minio/minio/legacy"
 	"github.com/minio/minio/neofs/layer"
 	"github.com/minio/minio/neofs/pool"
 	"github.com/minio/minio/pkg/auth"
diff --git a/main.go b/cmd/gate/main.go
similarity index 100%
rename from main.go
rename to cmd/gate/main.go
diff --git a/cmd/acl-handlers.go b/legacy/acl-handlers.go
similarity index 98%
rename from cmd/acl-handlers.go
rename to legacy/acl-handlers.go
index 931b449..8bb7c4c 100644
--- a/cmd/acl-handlers.go
+++ b/legacy/acl-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -23,8 +23,8 @@ import (
 	"net/url"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/admin-handlers-config-kv.go b/legacy/admin-handlers-config-kv.go
similarity index 96%
rename from cmd/admin-handlers-config-kv.go
rename to legacy/admin-handlers-config-kv.go
index 89ffa94..052679e 100644
--- a/cmd/admin-handlers-config-kv.go
+++ b/legacy/admin-handlers-config-kv.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,15 +26,15 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/etcd"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/etcd"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/admin-handlers-users.go b/legacy/admin-handlers-users.go
similarity index 99%
rename from cmd/admin-handlers-users.go
rename to legacy/admin-handlers-users.go
index 3aff707..b433185 100644
--- a/cmd/admin-handlers-users.go
+++ b/legacy/admin-handlers-users.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -24,7 +24,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/admin-handlers.go b/legacy/admin-handlers.go
similarity index 99%
rename from cmd/admin-handlers.go
rename to legacy/admin-handlers.go
index 3b321b5..c86b89e 100644
--- a/cmd/admin-handlers.go
+++ b/legacy/admin-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -36,12 +36,12 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/notify"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/handlers"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
diff --git a/cmd/admin-handlers_test.go b/legacy/admin-handlers_test.go
similarity index 99%
rename from cmd/admin-handlers_test.go
rename to legacy/admin-handlers_test.go
index 5955a50..8ed9fd5 100644
--- a/cmd/admin-handlers_test.go
+++ b/legacy/admin-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/admin-heal-ops.go b/legacy/admin-heal-ops.go
similarity index 99%
rename from cmd/admin-heal-ops.go
rename to legacy/admin-heal-ops.go
index 19a8b65..7623bf8 100644
--- a/cmd/admin-heal-ops.go
+++ b/legacy/admin-heal-ops.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/admin-quota-handlers.go b/legacy/admin-quota-handlers.go
similarity index 97%
rename from cmd/admin-quota-handlers.go
rename to legacy/admin-quota-handlers.go
index 3a65d71..9590c38 100644
--- a/cmd/admin-quota-handlers.go
+++ b/legacy/admin-quota-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -22,8 +22,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 )
diff --git a/cmd/admin-router.go b/legacy/admin-router.go
similarity index 99%
rename from cmd/admin-router.go
rename to legacy/admin-router.go
index f3c8773..bd218a9 100644
--- a/cmd/admin-router.go
+++ b/legacy/admin-router.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/madmin"
 )
diff --git a/cmd/admin-server-info.go b/legacy/admin-server-info.go
similarity index 99%
rename from cmd/admin-server-info.go
rename to legacy/admin-server-info.go
index d6f5626..6696b32 100644
--- a/cmd/admin-server-info.go
+++ b/legacy/admin-server-info.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/api-datatypes.go b/legacy/api-datatypes.go
similarity index 98%
rename from cmd/api-datatypes.go
rename to legacy/api-datatypes.go
index 59f2fd4..384a078 100644
--- a/cmd/api-datatypes.go
+++ b/legacy/api-datatypes.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
diff --git a/cmd/api-errors.go b/legacy/api-errors.go
similarity index 99%
rename from cmd/api-errors.go
rename to legacy/api-errors.go
index 3d334d9..232d2ec 100644
--- a/cmd/api-errors.go
+++ b/legacy/api-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,9 +29,9 @@ import (
 
 	minio "github.com/minio/minio-go/v6"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
diff --git a/cmd/api-errors_test.go b/legacy/api-errors_test.go
similarity index 98%
rename from cmd/api-errors_test.go
rename to legacy/api-errors_test.go
index dab7a81..86f24f5 100644
--- a/cmd/api-errors_test.go
+++ b/legacy/api-errors_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 	"github.com/minio/minio/pkg/hash"
 )
 
diff --git a/cmd/api-headers.go b/legacy/api-headers.go
similarity index 97%
rename from cmd/api-headers.go
rename to legacy/api-headers.go
index a9b8031..a5d1a3d 100644
--- a/cmd/api-headers.go
+++ b/legacy/api-headers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // Returns a hexadecimal representation of time at the
diff --git a/cmd/api-headers_test.go b/legacy/api-headers_test.go
similarity index 98%
rename from cmd/api-headers_test.go
rename to legacy/api-headers_test.go
index 26ca919..f85408a 100644
--- a/cmd/api-headers_test.go
+++ b/legacy/api-headers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/api-resources.go b/legacy/api-resources.go
similarity index 99%
rename from cmd/api-resources.go
rename to legacy/api-resources.go
index d3f1eaa..7588971 100644
--- a/cmd/api-resources.go
+++ b/legacy/api-resources.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/base64"
diff --git a/cmd/api-resources_test.go b/legacy/api-resources_test.go
similarity index 99%
rename from cmd/api-resources_test.go
rename to legacy/api-resources_test.go
index a210266..b876068 100644
--- a/cmd/api-resources_test.go
+++ b/legacy/api-resources_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/url"
diff --git a/cmd/api-response.go b/legacy/api-response.go
similarity index 99%
rename from cmd/api-response.go
rename to legacy/api-response.go
index b5bbc11..89de23a 100644
--- a/cmd/api-response.go
+++ b/legacy/api-response.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 )
 
diff --git a/cmd/api-response_test.go b/legacy/api-response_test.go
similarity index 99%
rename from cmd/api-response_test.go
rename to legacy/api-response_test.go
index 76c70f1..9dc0a36 100644
--- a/cmd/api-response_test.go
+++ b/legacy/api-response_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/api-router.go b/legacy/api-router.go
similarity index 99%
rename from cmd/api-router.go
rename to legacy/api-router.go
index 4011c9a..ffecfd7 100644
--- a/cmd/api-router.go
+++ b/legacy/api-router.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 func newHTTPServerFn() *xhttp.Server {
diff --git a/cmd/api-utils.go b/legacy/api-utils.go
similarity index 99%
rename from cmd/api-utils.go
rename to legacy/api-utils.go
index 0e370b1..613a412 100644
--- a/cmd/api-utils.go
+++ b/legacy/api-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"strings"
diff --git a/cmd/api-utils_test.go b/legacy/api-utils_test.go
similarity index 98%
rename from cmd/api-utils_test.go
rename to legacy/api-utils_test.go
index 0ef8179..5ecec05 100644
--- a/cmd/api-utils_test.go
+++ b/legacy/api-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/auth-handler.go b/legacy/auth-handler.go
similarity index 99%
rename from cmd/auth-handler.go
rename to legacy/auth-handler.go
index 8b133e4..0d66d76 100644
--- a/cmd/auth-handler.go
+++ b/legacy/auth-handler.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,9 +30,9 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	xjwt "github.com/minio/minio/cmd/jwt"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	xjwt "github.com/minio/minio/legacy/jwt"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
diff --git a/cmd/auth-handler_test.go b/legacy/auth-handler_test.go
similarity index 99%
rename from cmd/auth-handler_test.go
rename to legacy/auth-handler_test.go
index 92e72e8..417fb9e 100644
--- a/cmd/auth-handler_test.go
+++ b/legacy/auth-handler_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/background-heal-ops.go b/legacy/background-heal-ops.go
similarity index 98%
rename from cmd/background-heal-ops.go
rename to legacy/background-heal-ops.go
index b7d6b14..96bb19d 100644
--- a/cmd/background-heal-ops.go
+++ b/legacy/background-heal-ops.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/background-newdisks-heal-ops.go b/legacy/background-newdisks-heal-ops.go
similarity index 98%
rename from cmd/background-newdisks-heal-ops.go
rename to legacy/background-newdisks-heal-ops.go
index 5bfc86f..99900c6 100644
--- a/cmd/background-newdisks-heal-ops.go
+++ b/legacy/background-newdisks-heal-ops.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 const defaultMonitorNewDiskInterval = time.Minute * 10
diff --git a/cmd/benchmark-utils_test.go b/legacy/benchmark-utils_test.go
similarity index 99%
rename from cmd/benchmark-utils_test.go
rename to legacy/benchmark-utils_test.go
index c137728..5203525 100644
--- a/cmd/benchmark-utils_test.go
+++ b/legacy/benchmark-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bitrot-streaming.go b/legacy/bitrot-streaming.go
similarity index 98%
rename from cmd/bitrot-streaming.go
rename to legacy/bitrot-streaming.go
index b05fbe1..21dd521 100644
--- a/cmd/bitrot-streaming.go
+++ b/legacy/bitrot-streaming.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -23,7 +23,7 @@ import (
 	"hash"
 	"io"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 type errHashMismatch struct {
diff --git a/cmd/bitrot-whole.go b/legacy/bitrot-whole.go
similarity index 98%
rename from cmd/bitrot-whole.go
rename to legacy/bitrot-whole.go
index fc016b5..19c2eb7 100644
--- a/cmd/bitrot-whole.go
+++ b/legacy/bitrot-whole.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"hash"
 	"io"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Implementation to calculate bitrot for the whole file.
diff --git a/cmd/bitrot.go b/legacy/bitrot.go
similarity index 98%
rename from cmd/bitrot.go
rename to legacy/bitrot.go
index bfdecfb..cd61b35 100644
--- a/cmd/bitrot.go
+++ b/legacy/bitrot.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
@@ -22,7 +22,7 @@ import (
 	"io"
 
 	"github.com/minio/highwayhash"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"golang.org/x/crypto/blake2b"
 )
diff --git a/cmd/bitrot_test.go b/legacy/bitrot_test.go
similarity index 99%
rename from cmd/bitrot_test.go
rename to legacy/bitrot_test.go
index 78cf9dc..b4bb093 100644
--- a/cmd/bitrot_test.go
+++ b/legacy/bitrot_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io"
diff --git a/cmd/bootstrap-peer-server.go b/legacy/bootstrap-peer-server.go
similarity index 98%
rename from cmd/bootstrap-peer-server.go
rename to legacy/bootstrap-peer-server.go
index 4692d15..971f85b 100644
--- a/cmd/bootstrap-peer-server.go
+++ b/legacy/bootstrap-peer-server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -30,9 +30,9 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio/minio-go/v6/pkg/set"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 )
 
 const (
diff --git a/cmd/bucket-encryption-handlers.go b/legacy/bucket-encryption-handlers.go
similarity index 99%
rename from cmd/bucket-encryption-handlers.go
rename to legacy/bucket-encryption-handlers.go
index 866ba20..aea3ca7 100644
--- a/cmd/bucket-encryption-handlers.go
+++ b/legacy/bucket-encryption-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -23,7 +23,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/bucket-encryption.go b/legacy/bucket-encryption.go
similarity index 99%
rename from cmd/bucket-encryption.go
rename to legacy/bucket-encryption.go
index b5504c9..4d574d4 100644
--- a/cmd/bucket-encryption.go
+++ b/legacy/bucket-encryption.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/bucket-encryption_test.go b/legacy/bucket-encryption_test.go
similarity index 99%
rename from cmd/bucket-encryption_test.go
rename to legacy/bucket-encryption_test.go
index 25548ca..5d43807 100644
--- a/cmd/bucket-encryption_test.go
+++ b/legacy/bucket-encryption_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-handlers.go b/legacy/bucket-handlers.go
similarity index 99%
rename from cmd/bucket-handlers.go
rename to legacy/bucket-handlers.go
index ce0ca1a..20d714d 100644
--- a/cmd/bucket-handlers.go
+++ b/legacy/bucket-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/base64"
@@ -28,13 +28,12 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-
 	"github.com/minio/minio-go/v6/pkg/set"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
diff --git a/cmd/bucket-handlers_test.go b/legacy/bucket-handlers_test.go
similarity index 99%
rename from cmd/bucket-handlers_test.go
rename to legacy/bucket-handlers_test.go
index 3f4f807..c6b6ae3 100644
--- a/cmd/bucket-handlers_test.go
+++ b/legacy/bucket-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-lifecycle-handlers.go b/legacy/bucket-lifecycle-handlers.go
similarity index 98%
rename from cmd/bucket-lifecycle-handlers.go
rename to legacy/bucket-lifecycle-handlers.go
index bd381b2..445b031 100644
--- a/cmd/bucket-lifecycle-handlers.go
+++ b/legacy/bucket-lifecycle-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -22,8 +22,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
diff --git a/cmd/bucket-lifecycle-handlers_test.go b/legacy/bucket-lifecycle-handlers_test.go
similarity index 99%
rename from cmd/bucket-lifecycle-handlers_test.go
rename to legacy/bucket-lifecycle-handlers_test.go
index 3af5daf..86512e4 100644
--- a/cmd/bucket-lifecycle-handlers_test.go
+++ b/legacy/bucket-lifecycle-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-lifecycle.go b/legacy/bucket-lifecycle.go
similarity index 98%
rename from cmd/bucket-lifecycle.go
rename to legacy/bucket-lifecycle.go
index fd7c9f6..f8a81d9 100644
--- a/cmd/bucket-lifecycle.go
+++ b/legacy/bucket-lifecycle.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"github.com/minio/minio/pkg/bucket/lifecycle"
diff --git a/cmd/bucket-listobjects-handlers.go b/legacy/bucket-listobjects-handlers.go
similarity index 99%
rename from cmd/bucket-listobjects-handlers.go
rename to legacy/bucket-listobjects-handlers.go
index ad03b1f..0c4ccff 100644
--- a/cmd/bucket-listobjects-handlers.go
+++ b/legacy/bucket-listobjects-handlers.go
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
-
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/bucket-metadata-sys.go b/legacy/bucket-metadata-sys.go
similarity index 99%
rename from cmd/bucket-metadata-sys.go
rename to legacy/bucket-metadata-sys.go
index 6ee467c..6d7d9ce 100644
--- a/cmd/bucket-metadata-sys.go
+++ b/legacy/bucket-metadata-sys.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-metadata.go b/legacy/bucket-metadata.go
similarity index 99%
rename from cmd/bucket-metadata.go
rename to legacy/bucket-metadata.go
index 6db1367..78da91c 100644
--- a/cmd/bucket-metadata.go
+++ b/legacy/bucket-metadata.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	bucketsse "github.com/minio/minio/pkg/bucket/encryption"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
diff --git a/cmd/bucket-metadata_gen.go b/legacy/bucket-metadata_gen.go
similarity index 99%
rename from cmd/bucket-metadata_gen.go
rename to legacy/bucket-metadata_gen.go
index 5ec12eb..390886d 100644
--- a/cmd/bucket-metadata_gen.go
+++ b/legacy/bucket-metadata_gen.go
@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 
diff --git a/cmd/bucket-metadata_gen_test.go b/legacy/bucket-metadata_gen_test.go
similarity index 99%
rename from cmd/bucket-metadata_gen_test.go
rename to legacy/bucket-metadata_gen_test.go
index 066a68d..203e674 100644
--- a/cmd/bucket-metadata_gen_test.go
+++ b/legacy/bucket-metadata_gen_test.go
@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 
diff --git a/cmd/bucket-notification-handlers.go b/legacy/bucket-notification-handlers.go
similarity index 98%
rename from cmd/bucket-notification-handlers.go
rename to legacy/bucket-notification-handlers.go
index 36367d3..ec31a3a 100644
--- a/cmd/bucket-notification-handlers.go
+++ b/legacy/bucket-notification-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
 )
diff --git a/cmd/bucket-object-lock.go b/legacy/bucket-object-lock.go
similarity index 99%
rename from cmd/bucket-object-lock.go
rename to legacy/bucket-object-lock.go
index 73b1035..1652ce3 100644
--- a/cmd/bucket-object-lock.go
+++ b/legacy/bucket-object-lock.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"math"
 	"net/http"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
diff --git a/cmd/bucket-policy-handlers.go b/legacy/bucket-policy-handlers.go
similarity index 99%
rename from cmd/bucket-policy-handlers.go
rename to legacy/bucket-policy-handlers.go
index f659d24..b59093a 100644
--- a/cmd/bucket-policy-handlers.go
+++ b/legacy/bucket-policy-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -23,7 +23,7 @@ import (
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/bucket-policy-handlers_test.go b/legacy/bucket-policy-handlers_test.go
similarity index 99%
rename from cmd/bucket-policy-handlers_test.go
rename to legacy/bucket-policy-handlers_test.go
index 91c1b5c..c2f67c4 100644
--- a/cmd/bucket-policy-handlers_test.go
+++ b/legacy/bucket-policy-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-policy.go b/legacy/bucket-policy.go
similarity index 98%
rename from cmd/bucket-policy.go
rename to legacy/bucket-policy.go
index baec0f4..2f04a8c 100644
--- a/cmd/bucket-policy.go
+++ b/legacy/bucket-policy.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -26,8 +26,8 @@ import (
 
 	jsoniter "github.com/json-iterator/go"
 	miniogopolicy "github.com/minio/minio-go/v6/pkg/policy"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/handlers"
 )
diff --git a/cmd/bucket-quota.go b/legacy/bucket-quota.go
similarity index 98%
rename from cmd/bucket-quota.go
rename to legacy/bucket-quota.go
index 4fdcf6d..93a7313 100644
--- a/cmd/bucket-quota.go
+++ b/legacy/bucket-quota.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/build-constants.go b/legacy/build-constants.go
similarity index 98%
rename from cmd/build-constants.go
rename to legacy/build-constants.go
index 8b9a278..adcc534 100644
--- a/cmd/build-constants.go
+++ b/legacy/build-constants.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // DO NOT EDIT THIS FILE DIRECTLY. These are build-time constants
 // set through ‘buildscripts/gen-ldflags.go’.
diff --git a/cmd/common-main.go b/legacy/common-main.go
similarity index 98%
rename from cmd/common-main.go
rename to legacy/common-main.go
index 4fc455b..78c00c1 100644
--- a/cmd/common-main.go
+++ b/legacy/common-main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/x509"
@@ -29,8 +29,8 @@ import (
 	dns2 "github.com/miekg/dns"
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/certs"
 	"github.com/minio/minio/pkg/env"
diff --git a/cmd/config-common.go b/legacy/config-common.go
similarity index 97%
rename from cmd/config-common.go
rename to legacy/config-common.go
index 1cc9543..d444742 100644
--- a/cmd/config-common.go
+++ b/legacy/config-common.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
 	"context"
 	"errors"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/hash"
 )
 
diff --git a/cmd/config-current.go b/legacy/config-current.go
similarity index 96%
rename from cmd/config-current.go
rename to legacy/config-current.go
index 9fddd1c..eb50fdc 100644
--- a/cmd/config-current.go
+++ b/legacy/config-current.go
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
 	"strings"
 	"sync"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/api"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/compress"
-	"github.com/minio/minio/cmd/config/etcd"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/notify"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/target/http"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/api"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/config/etcd"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/target/http"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/madmin"
 )
diff --git a/cmd/config-current_test.go b/legacy/config-current_test.go
similarity index 96%
rename from cmd/config-current_test.go
rename to legacy/config-current_test.go
index c77a744..c60517d 100644
--- a/cmd/config-current_test.go
+++ b/legacy/config-current_test.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"os"
 	"testing"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 func TestServerConfig(t *testing.T) {
diff --git a/cmd/config-dir.go b/legacy/config-dir.go
similarity index 99%
rename from cmd/config-dir.go
rename to legacy/config-dir.go
index c76ed30..dda3a02 100644
--- a/cmd/config-dir.go
+++ b/legacy/config-dir.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/config-encrypted.go b/legacy/config-encrypted.go
similarity index 98%
rename from cmd/config-encrypted.go
rename to legacy/config-encrypted.go
index 1703653..2e756f9 100644
--- a/cmd/config-encrypted.go
+++ b/legacy/config-encrypted.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,8 +25,8 @@ import (
 	"unicode/utf8"
 
 	etcd "github.com/coreos/etcd/clientv3"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/madmin"
 )
diff --git a/cmd/config-encrypted_test.go b/legacy/config-encrypted_test.go
similarity index 99%
rename from cmd/config-encrypted_test.go
rename to legacy/config-encrypted_test.go
index 860e168..2190f0b 100644
--- a/cmd/config-encrypted_test.go
+++ b/legacy/config-encrypted_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/config-migrate.go b/legacy/config-migrate.go
similarity index 99%
rename from cmd/config-migrate.go
rename to legacy/config-migrate.go
index 23e56c7..b82b40e 100644
--- a/cmd/config-migrate.go
+++ b/legacy/config-migrate.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,16 +25,16 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/compress"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/notify"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/event/target"
diff --git a/cmd/config-migrate_test.go b/legacy/config-migrate_test.go
similarity index 99%
rename from cmd/config-migrate_test.go
rename to legacy/config-migrate_test.go
index 5cd087b..9fe9ac9 100644
--- a/cmd/config-migrate_test.go
+++ b/legacy/config-migrate_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Test if config v1 is purged
diff --git a/cmd/config-versions.go b/legacy/config-versions.go
similarity index 98%
rename from cmd/config-versions.go
rename to legacy/config-versions.go
index 6084955..8d96d2d 100644
--- a/cmd/config-versions.go
+++ b/legacy/config-versions.go
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"sync"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/compress"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/notify"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/event/target"
 	"github.com/minio/minio/pkg/quick"
diff --git a/cmd/config.go b/legacy/config.go
similarity index 99%
rename from cmd/config.go
rename to legacy/config.go
index ef51107..67bec8e 100644
--- a/cmd/config.go
+++ b/legacy/config.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/config/api/api.go b/legacy/config/api/api.go
similarity index 98%
rename from cmd/config/api/api.go
rename to legacy/config/api/api.go
index 3ae52db..dd9ff6a 100644
--- a/cmd/config/api/api.go
+++ b/legacy/config/api/api.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/config/api/help.go b/legacy/config/api/help.go
similarity index 96%
rename from cmd/config/api/help.go
rename to legacy/config/api/help.go
index f9072a6..f233802 100644
--- a/cmd/config/api/help.go
+++ b/legacy/config/api/help.go
@@ -16,7 +16,7 @@
 
 package api
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for storageclass feature.
 var (
diff --git a/cmd/config/bool-flag.go b/legacy/config/bool-flag.go
similarity index 100%
rename from cmd/config/bool-flag.go
rename to legacy/config/bool-flag.go
diff --git a/cmd/config/bool-flag_test.go b/legacy/config/bool-flag_test.go
similarity index 100%
rename from cmd/config/bool-flag_test.go
rename to legacy/config/bool-flag_test.go
diff --git a/cmd/config/cache/config.go b/legacy/config/cache/config.go
similarity index 99%
rename from cmd/config/cache/config.go
rename to legacy/config/cache/config.go
index 125860d..0a780d1 100644
--- a/cmd/config/cache/config.go
+++ b/legacy/config/cache/config.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/ellipses"
 )
 
diff --git a/cmd/config/cache/config_test.go b/legacy/config/cache/config_test.go
similarity index 100%
rename from cmd/config/cache/config_test.go
rename to legacy/config/cache/config_test.go
diff --git a/cmd/config/cache/help.go b/legacy/config/cache/help.go
similarity index 97%
rename from cmd/config/cache/help.go
rename to legacy/config/cache/help.go
index 0a34646..c01cc58 100644
--- a/cmd/config/cache/help.go
+++ b/legacy/config/cache/help.go
@@ -16,7 +16,7 @@
 
 package cache
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for caching feature.
 var (
diff --git a/cmd/config/cache/legacy.go b/legacy/config/cache/legacy.go
similarity index 97%
rename from cmd/config/cache/legacy.go
rename to legacy/config/cache/legacy.go
index 938850c..a6a9faf 100644
--- a/cmd/config/cache/legacy.go
+++ b/legacy/config/cache/legacy.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 const (
diff --git a/cmd/config/cache/lookup.go b/legacy/config/cache/lookup.go
similarity index 99%
rename from cmd/config/cache/lookup.go
rename to legacy/config/cache/lookup.go
index d487c55..68ba30f 100644
--- a/cmd/config/cache/lookup.go
+++ b/legacy/config/cache/lookup.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/config/certs.go b/legacy/config/certs.go
similarity index 100%
rename from cmd/config/certs.go
rename to legacy/config/certs.go
diff --git a/cmd/config/certs_test.go b/legacy/config/certs_test.go
similarity index 100%
rename from cmd/config/certs_test.go
rename to legacy/config/certs_test.go
diff --git a/cmd/config/certsinfo.go b/legacy/config/certsinfo.go
similarity index 100%
rename from cmd/config/certsinfo.go
rename to legacy/config/certsinfo.go
diff --git a/cmd/config/compress/compress.go b/legacy/config/compress/compress.go
similarity index 98%
rename from cmd/config/compress/compress.go
rename to legacy/config/compress/compress.go
index a72dfc9..092e03a 100644
--- a/cmd/config/compress/compress.go
+++ b/legacy/config/compress/compress.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/config/compress/compress_test.go b/legacy/config/compress/compress_test.go
similarity index 100%
rename from cmd/config/compress/compress_test.go
rename to legacy/config/compress/compress_test.go
diff --git a/cmd/config/compress/help.go b/legacy/config/compress/help.go
similarity index 96%
rename from cmd/config/compress/help.go
rename to legacy/config/compress/help.go
index b292cd6..c7f4783 100644
--- a/cmd/config/compress/help.go
+++ b/legacy/config/compress/help.go
@@ -16,7 +16,7 @@
 
 package compress
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for compress feature.
 var (
diff --git a/cmd/config/compress/legacy.go b/legacy/config/compress/legacy.go
similarity index 97%
rename from cmd/config/compress/legacy.go
rename to legacy/config/compress/legacy.go
index 379e8f8..8f8d3d7 100644
--- a/cmd/config/compress/legacy.go
+++ b/legacy/config/compress/legacy.go
@@ -19,7 +19,7 @@ package compress
 import (
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Legacy envs.
diff --git a/cmd/config/config.go b/legacy/config/config.go
similarity index 100%
rename from cmd/config/config.go
rename to legacy/config/config.go
diff --git a/cmd/config/config_test.go b/legacy/config/config_test.go
similarity index 100%
rename from cmd/config/config_test.go
rename to legacy/config/config_test.go
diff --git a/cmd/config/constants.go b/legacy/config/constants.go
similarity index 100%
rename from cmd/config/constants.go
rename to legacy/config/constants.go
diff --git a/cmd/config/errors-utils.go b/legacy/config/errors-utils.go
similarity index 100%
rename from cmd/config/errors-utils.go
rename to legacy/config/errors-utils.go
diff --git a/cmd/config/errors.go b/legacy/config/errors.go
similarity index 100%
rename from cmd/config/errors.go
rename to legacy/config/errors.go
diff --git a/cmd/config/etcd/dns/etcd_dns.go b/legacy/config/etcd/dns/etcd_dns.go
similarity index 100%
rename from cmd/config/etcd/dns/etcd_dns.go
rename to legacy/config/etcd/dns/etcd_dns.go
diff --git a/cmd/config/etcd/dns/types.go b/legacy/config/etcd/dns/types.go
similarity index 100%
rename from cmd/config/etcd/dns/types.go
rename to legacy/config/etcd/dns/types.go
diff --git a/cmd/config/etcd/etcd.go b/legacy/config/etcd/etcd.go
similarity index 99%
rename from cmd/config/etcd/etcd.go
rename to legacy/config/etcd/etcd.go
index 67fb78f..23d7569 100644
--- a/cmd/config/etcd/etcd.go
+++ b/legacy/config/etcd/etcd.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/namespace"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 )
diff --git a/cmd/config/etcd/etcd_test.go b/legacy/config/etcd/etcd_test.go
similarity index 100%
rename from cmd/config/etcd/etcd_test.go
rename to legacy/config/etcd/etcd_test.go
diff --git a/cmd/config/etcd/help.go b/legacy/config/etcd/help.go
similarity index 97%
rename from cmd/config/etcd/help.go
rename to legacy/config/etcd/help.go
index 8009709..6d7d1c2 100644
--- a/cmd/config/etcd/help.go
+++ b/legacy/config/etcd/help.go
@@ -16,7 +16,7 @@
 
 package etcd
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // etcd config documented in default config
 var (
diff --git a/cmd/config/help.go b/legacy/config/help.go
similarity index 100%
rename from cmd/config/help.go
rename to legacy/config/help.go
diff --git a/cmd/config/identity/ldap/config.go b/legacy/config/identity/ldap/config.go
similarity index 99%
rename from cmd/config/identity/ldap/config.go
rename to legacy/config/identity/ldap/config.go
index b4ac1df..4b3c09c 100644
--- a/cmd/config/identity/ldap/config.go
+++ b/legacy/config/identity/ldap/config.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	ldap "gopkg.in/ldap.v3"
 )
diff --git a/cmd/config/identity/ldap/help.go b/legacy/config/identity/ldap/help.go
similarity index 98%
rename from cmd/config/identity/ldap/help.go
rename to legacy/config/identity/ldap/help.go
index b3d14b0..a78d2ee 100644
--- a/cmd/config/identity/ldap/help.go
+++ b/legacy/config/identity/ldap/help.go
@@ -16,7 +16,7 @@
 
 package ldap
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for LDAP identity feature.
 var (
diff --git a/cmd/config/identity/ldap/legacy.go b/legacy/config/identity/ldap/legacy.go
similarity index 96%
rename from cmd/config/identity/ldap/legacy.go
rename to legacy/config/identity/ldap/legacy.go
index 98f36c1..24d0d72 100644
--- a/cmd/config/identity/ldap/legacy.go
+++ b/legacy/config/identity/ldap/legacy.go
@@ -16,7 +16,7 @@
 
 package ldap
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // SetIdentityLDAP - One time migration code needed, for migrating from older config to new for LDAPConfig.
 func SetIdentityLDAP(s config.Config, ldapArgs Config) {
diff --git a/cmd/config/identity/openid/ecdsa-sha3.go b/legacy/config/identity/openid/ecdsa-sha3.go
similarity index 100%
rename from cmd/config/identity/openid/ecdsa-sha3.go
rename to legacy/config/identity/openid/ecdsa-sha3.go
diff --git a/cmd/config/identity/openid/help.go b/legacy/config/identity/openid/help.go
similarity index 97%
rename from cmd/config/identity/openid/help.go
rename to legacy/config/identity/openid/help.go
index 9bb249c..9e89dce 100644
--- a/cmd/config/identity/openid/help.go
+++ b/legacy/config/identity/openid/help.go
@@ -16,7 +16,7 @@
 
 package openid
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for OpenID identity feature.
 var (
diff --git a/cmd/config/identity/openid/jwks.go b/legacy/config/identity/openid/jwks.go
similarity index 100%
rename from cmd/config/identity/openid/jwks.go
rename to legacy/config/identity/openid/jwks.go
diff --git a/cmd/config/identity/openid/jwks_test.go b/legacy/config/identity/openid/jwks_test.go
similarity index 100%
rename from cmd/config/identity/openid/jwks_test.go
rename to legacy/config/identity/openid/jwks_test.go
diff --git a/cmd/config/identity/openid/jwt.go b/legacy/config/identity/openid/jwt.go
similarity index 99%
rename from cmd/config/identity/openid/jwt.go
rename to legacy/config/identity/openid/jwt.go
index b652d42..519c9cc 100644
--- a/cmd/config/identity/openid/jwt.go
+++ b/legacy/config/identity/openid/jwt.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	jwtgo "github.com/dgrijalva/jwt-go"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/env"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
diff --git a/cmd/config/identity/openid/jwt_test.go b/legacy/config/identity/openid/jwt_test.go
similarity index 100%
rename from cmd/config/identity/openid/jwt_test.go
rename to legacy/config/identity/openid/jwt_test.go
diff --git a/cmd/config/identity/openid/legacy.go b/legacy/config/identity/openid/legacy.go
similarity index 96%
rename from cmd/config/identity/openid/legacy.go
rename to legacy/config/identity/openid/legacy.go
index de9adc9..3999778 100644
--- a/cmd/config/identity/openid/legacy.go
+++ b/legacy/config/identity/openid/legacy.go
@@ -16,7 +16,7 @@
 
 package openid
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Legacy envs
 const (
diff --git a/cmd/config/identity/openid/rsa-sha3.go b/legacy/config/identity/openid/rsa-sha3.go
similarity index 100%
rename from cmd/config/identity/openid/rsa-sha3.go
rename to legacy/config/identity/openid/rsa-sha3.go
diff --git a/cmd/config/identity/openid/validators.go b/legacy/config/identity/openid/validators.go
similarity index 100%
rename from cmd/config/identity/openid/validators.go
rename to legacy/config/identity/openid/validators.go
diff --git a/cmd/config/identity/openid/validators_test.go b/legacy/config/identity/openid/validators_test.go
similarity index 100%
rename from cmd/config/identity/openid/validators_test.go
rename to legacy/config/identity/openid/validators_test.go
diff --git a/cmd/config/legacy.go b/legacy/config/legacy.go
similarity index 100%
rename from cmd/config/legacy.go
rename to legacy/config/legacy.go
diff --git a/cmd/config/notify/config.go b/legacy/config/notify/config.go
similarity index 100%
rename from cmd/config/notify/config.go
rename to legacy/config/notify/config.go
diff --git a/cmd/config/notify/help.go b/legacy/config/notify/help.go
similarity index 99%
rename from cmd/config/notify/help.go
rename to legacy/config/notify/help.go
index 05f7d9a..53c1dc1 100644
--- a/cmd/config/notify/help.go
+++ b/legacy/config/notify/help.go
@@ -17,7 +17,7 @@
 package notify
 
 import (
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/event/target"
 )
 
diff --git a/cmd/config/notify/legacy.go b/legacy/config/notify/legacy.go
similarity index 99%
rename from cmd/config/notify/legacy.go
rename to legacy/config/notify/legacy.go
index 1c79965..c692c11 100644
--- a/cmd/config/notify/legacy.go
+++ b/legacy/config/notify/legacy.go
@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/event/target"
 )
 
diff --git a/cmd/config/notify/parse.go b/legacy/config/notify/parse.go
similarity index 99%
rename from cmd/config/notify/parse.go
rename to legacy/config/notify/parse.go
index 93f603d..9adc5c8 100644
--- a/cmd/config/notify/parse.go
+++ b/legacy/config/notify/parse.go
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/event/target"
diff --git a/cmd/config/policy/opa/config.go b/legacy/config/policy/opa/config.go
similarity index 99%
rename from cmd/config/policy/opa/config.go
rename to legacy/config/policy/opa/config.go
index 05745e2..e4e777d 100644
--- a/cmd/config/policy/opa/config.go
+++ b/legacy/config/policy/opa/config.go
@@ -23,7 +23,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	xnet "github.com/minio/minio/pkg/net"
diff --git a/cmd/config/policy/opa/help.go b/legacy/config/policy/opa/help.go
similarity index 96%
rename from cmd/config/policy/opa/help.go
rename to legacy/config/policy/opa/help.go
index 7090b09..54cd707 100644
--- a/cmd/config/policy/opa/help.go
+++ b/legacy/config/policy/opa/help.go
@@ -16,7 +16,7 @@
 
 package opa
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for OPA policy feature.
 var (
diff --git a/cmd/config/policy/opa/legacy.go b/legacy/config/policy/opa/legacy.go
similarity index 96%
rename from cmd/config/policy/opa/legacy.go
rename to legacy/config/policy/opa/legacy.go
index 04ecb08..060c58c 100644
--- a/cmd/config/policy/opa/legacy.go
+++ b/legacy/config/policy/opa/legacy.go
@@ -17,7 +17,7 @@
 package opa
 
 import (
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Legacy OPA envs
diff --git a/cmd/config/storageclass/help.go b/legacy/config/storageclass/help.go
similarity index 96%
rename from cmd/config/storageclass/help.go
rename to legacy/config/storageclass/help.go
index a7bf896..eda5b30 100644
--- a/cmd/config/storageclass/help.go
+++ b/legacy/config/storageclass/help.go
@@ -16,7 +16,7 @@
 
 package storageclass
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for storageclass feature.
 var (
diff --git a/cmd/config/storageclass/legacy.go b/legacy/config/storageclass/legacy.go
similarity index 96%
rename from cmd/config/storageclass/legacy.go
rename to legacy/config/storageclass/legacy.go
index 8059bf5..d52b925 100644
--- a/cmd/config/storageclass/legacy.go
+++ b/legacy/config/storageclass/legacy.go
@@ -17,7 +17,7 @@
 package storageclass
 
 import (
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // SetStorageClass - One time migration code needed, for migrating from older config to new for StorageClass.
diff --git a/cmd/config/storageclass/storage-class.go b/legacy/config/storageclass/storage-class.go
similarity index 99%
rename from cmd/config/storageclass/storage-class.go
rename to legacy/config/storageclass/storage-class.go
index 37e3e0f..1d91384 100644
--- a/cmd/config/storageclass/storage-class.go
+++ b/legacy/config/storageclass/storage-class.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/config/storageclass/storage-class_test.go b/legacy/config/storageclass/storage-class_test.go
similarity index 100%
rename from cmd/config/storageclass/storage-class_test.go
rename to legacy/config/storageclass/storage-class_test.go
diff --git a/cmd/consolelogger.go b/legacy/consolelogger.go
similarity index 95%
rename from cmd/consolelogger.go
rename to legacy/consolelogger.go
index 103a892..26ecc65 100644
--- a/cmd/consolelogger.go
+++ b/legacy/consolelogger.go
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	ring "container/ring"
 	"context"
 	"sync"
 
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/message/log"
-	"github.com/minio/minio/cmd/logger/target/console"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
+	"github.com/minio/minio/legacy/logger/target/console"
 	xnet "github.com/minio/minio/pkg/net"
 	"github.com/minio/minio/pkg/pubsub"
 )
diff --git a/cmd/copy-part-range.go b/legacy/copy-part-range.go
similarity index 99%
rename from cmd/copy-part-range.go
rename to legacy/copy-part-range.go
index ed9eca3..c87a505 100644
--- a/cmd/copy-part-range.go
+++ b/legacy/copy-part-range.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/copy-part-range_test.go b/legacy/copy-part-range_test.go
similarity index 99%
rename from cmd/copy-part-range_test.go
rename to legacy/copy-part-range_test.go
index 1566e75..468dfd8 100644
--- a/cmd/copy-part-range_test.go
+++ b/legacy/copy-part-range_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "testing"
 
diff --git a/cmd/crossdomain-xml-handler.go b/legacy/crossdomain-xml-handler.go
similarity index 99%
rename from cmd/crossdomain-xml-handler.go
rename to legacy/crossdomain-xml-handler.go
index a658103..e20918c 100644
--- a/cmd/crossdomain-xml-handler.go
+++ b/legacy/crossdomain-xml-handler.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "net/http"
 
diff --git a/cmd/crossdomain-xml-handler_test.go b/legacy/crossdomain-xml-handler_test.go
similarity index 98%
rename from cmd/crossdomain-xml-handler_test.go
rename to legacy/crossdomain-xml-handler_test.go
index 7bd53f4..4584518 100644
--- a/cmd/crossdomain-xml-handler_test.go
+++ b/legacy/crossdomain-xml-handler_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/crypto/config.go b/legacy/crypto/config.go
similarity index 99%
rename from cmd/crypto/config.go
rename to legacy/crypto/config.go
index 81a7974..034273a 100644
--- a/cmd/crypto/config.go
+++ b/legacy/crypto/config.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 )
diff --git a/cmd/crypto/doc.go b/legacy/crypto/doc.go
similarity index 100%
rename from cmd/crypto/doc.go
rename to legacy/crypto/doc.go
diff --git a/cmd/crypto/error.go b/legacy/crypto/error.go
similarity index 100%
rename from cmd/crypto/error.go
rename to legacy/crypto/error.go
diff --git a/cmd/crypto/header.go b/legacy/crypto/header.go
similarity index 100%
rename from cmd/crypto/header.go
rename to legacy/crypto/header.go
diff --git a/cmd/crypto/header_test.go b/legacy/crypto/header_test.go
similarity index 100%
rename from cmd/crypto/header_test.go
rename to legacy/crypto/header_test.go
diff --git a/cmd/crypto/help.go b/legacy/crypto/help.go
similarity index 98%
rename from cmd/crypto/help.go
rename to legacy/crypto/help.go
index 8fa3c65..64e5365 100644
--- a/cmd/crypto/help.go
+++ b/legacy/crypto/help.go
@@ -16,7 +16,7 @@
 
 package crypto
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for KMS vault
 var (
diff --git a/cmd/crypto/kes.go b/legacy/crypto/kes.go
similarity index 99%
rename from cmd/crypto/kes.go
rename to legacy/crypto/kes.go
index 10f3c0b..505e6ca 100644
--- a/cmd/crypto/kes.go
+++ b/legacy/crypto/kes.go
@@ -30,7 +30,7 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	xnet "github.com/minio/minio/pkg/net"
 )
 
diff --git a/cmd/crypto/key.go b/legacy/crypto/key.go
similarity index 99%
rename from cmd/crypto/key.go
rename to legacy/crypto/key.go
index f069159..8c18995 100644
--- a/cmd/crypto/key.go
+++ b/legacy/crypto/key.go
@@ -24,7 +24,7 @@ import (
 	"io"
 	"path"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"github.com/minio/sio"
 )
diff --git a/cmd/crypto/key_test.go b/legacy/crypto/key_test.go
similarity index 99%
rename from cmd/crypto/key_test.go
rename to legacy/crypto/key_test.go
index f8059e2..07aa7f8 100644
--- a/cmd/crypto/key_test.go
+++ b/legacy/crypto/key_test.go
@@ -21,7 +21,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 var shortRandom = func(limit int64) io.Reader { return io.LimitReader(rand.Reader, limit) }
diff --git a/cmd/crypto/kms.go b/legacy/crypto/kms.go
similarity index 99%
rename from cmd/crypto/kms.go
rename to legacy/crypto/kms.go
index cc7a097..3ba964a 100644
--- a/cmd/crypto/kms.go
+++ b/legacy/crypto/kms.go
@@ -24,7 +24,7 @@ import (
 	"io"
 	"sort"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"github.com/minio/sio"
 )
diff --git a/cmd/crypto/kms_test.go b/legacy/crypto/kms_test.go
similarity index 100%
rename from cmd/crypto/kms_test.go
rename to legacy/crypto/kms_test.go
diff --git a/cmd/crypto/legacy.go b/legacy/crypto/legacy.go
similarity index 99%
rename from cmd/crypto/legacy.go
rename to legacy/crypto/legacy.go
index a074e16..13b7c70 100644
--- a/cmd/crypto/legacy.go
+++ b/legacy/crypto/legacy.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 )
diff --git a/cmd/crypto/metadata.go b/legacy/crypto/metadata.go
similarity index 99%
rename from cmd/crypto/metadata.go
rename to legacy/crypto/metadata.go
index ee0864b..a5922f2 100644
--- a/cmd/crypto/metadata.go
+++ b/legacy/crypto/metadata.go
@@ -19,7 +19,7 @@ import (
 	"encoding/base64"
 	"errors"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // IsMultiPart returns true if the object metadata indicates
diff --git a/cmd/crypto/metadata_test.go b/legacy/crypto/metadata_test.go
similarity index 99%
rename from cmd/crypto/metadata_test.go
rename to legacy/crypto/metadata_test.go
index 828eea0..e38a6c4 100644
--- a/cmd/crypto/metadata_test.go
+++ b/legacy/crypto/metadata_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 var isMultipartTests = []struct {
diff --git a/cmd/crypto/parse.go b/legacy/crypto/parse.go
similarity index 100%
rename from cmd/crypto/parse.go
rename to legacy/crypto/parse.go
diff --git a/cmd/crypto/parse_test.go b/legacy/crypto/parse_test.go
similarity index 100%
rename from cmd/crypto/parse_test.go
rename to legacy/crypto/parse_test.go
diff --git a/cmd/crypto/retry.go b/legacy/crypto/retry.go
similarity index 100%
rename from cmd/crypto/retry.go
rename to legacy/crypto/retry.go
diff --git a/cmd/crypto/sse.go b/legacy/crypto/sse.go
similarity index 99%
rename from cmd/crypto/sse.go
rename to legacy/crypto/sse.go
index 87adcc1..34ed306 100644
--- a/cmd/crypto/sse.go
+++ b/legacy/crypto/sse.go
@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"path"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/ioutil"
 	"github.com/minio/sio"
 )
diff --git a/cmd/crypto/sse_test.go b/legacy/crypto/sse_test.go
similarity index 100%
rename from cmd/crypto/sse_test.go
rename to legacy/crypto/sse_test.go
diff --git a/cmd/crypto/vault.go b/legacy/crypto/vault.go
similarity index 100%
rename from cmd/crypto/vault.go
rename to legacy/crypto/vault.go
diff --git a/cmd/crypto/vault_test.go b/legacy/crypto/vault_test.go
similarity index 100%
rename from cmd/crypto/vault_test.go
rename to legacy/crypto/vault_test.go
diff --git a/cmd/data-crawler.go b/legacy/data-crawler.go
similarity index 99%
rename from cmd/data-crawler.go
rename to legacy/data-crawler.go
index 46b1e40..a5f1f27 100644
--- a/cmd/data-crawler.go
+++ b/legacy/data-crawler.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,9 +27,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/env"
diff --git a/cmd/data-update-tracker.go b/legacy/data-update-tracker.go
similarity index 99%
rename from cmd/data-update-tracker.go
rename to legacy/data-update-tracker.go
index be96e13..bb03e3c 100644
--- a/cmd/data-update-tracker.go
+++ b/legacy/data-update-tracker.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -31,8 +31,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/env"
 	"github.com/willf/bloom"
diff --git a/cmd/data-update-tracker_test.go b/legacy/data-update-tracker_test.go
similarity index 98%
rename from cmd/data-update-tracker_test.go
rename to legacy/data-update-tracker_test.go
index 9af0c9d..41de19a 100644
--- a/cmd/data-update-tracker_test.go
+++ b/legacy/data-update-tracker_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -28,8 +28,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
 )
 
 type testLoggerI interface {
diff --git a/cmd/data-usage-cache.go b/legacy/data-usage-cache.go
similarity index 99%
rename from cmd/data-usage-cache.go
rename to legacy/data-usage-cache.go
index 667a60a..1522607 100644
--- a/cmd/data-usage-cache.go
+++ b/legacy/data-usage-cache.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -29,7 +29,7 @@ import (
 
 	"github.com/cespare/xxhash/v2"
 	"github.com/klauspost/compress/zstd"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	"github.com/minio/minio/pkg/hash"
 	"github.com/tinylib/msgp/msgp"
diff --git a/cmd/data-usage-cache_gen.go b/legacy/data-usage-cache_gen.go
similarity index 99%
rename from cmd/data-usage-cache_gen.go
rename to legacy/data-usage-cache_gen.go
index be5cdd9..f0b59b4 100644
--- a/cmd/data-usage-cache_gen.go
+++ b/legacy/data-usage-cache_gen.go
@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 
diff --git a/cmd/data-usage-cache_gen_test.go b/legacy/data-usage-cache_gen_test.go
similarity index 99%
rename from cmd/data-usage-cache_gen_test.go
rename to legacy/data-usage-cache_gen_test.go
index 8922e16..b3cfc0a 100644
--- a/cmd/data-usage-cache_gen_test.go
+++ b/legacy/data-usage-cache_gen_test.go
@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 
diff --git a/cmd/data-usage.go b/legacy/data-usage.go
similarity index 98%
rename from cmd/data-usage.go
rename to legacy/data-usage.go
index bcec9ac..981061c 100644
--- a/cmd/data-usage.go
+++ b/legacy/data-usage.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -22,7 +22,7 @@ import (
 	"encoding/json"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/hash"
 )
 
diff --git a/cmd/data-usage_test.go b/legacy/data-usage_test.go
similarity index 99%
rename from cmd/data-usage_test.go
rename to legacy/data-usage_test.go
index 5255459..3dd24b7 100644
--- a/cmd/data-usage_test.go
+++ b/legacy/data-usage_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/disk-cache-backend.go b/legacy/disk-cache-backend.go
similarity index 99%
rename from cmd/disk-cache-backend.go
rename to legacy/disk-cache-backend.go
index 43b3644..afd07b1 100644
--- a/cmd/disk-cache-backend.go
+++ b/legacy/disk-cache-backend.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -33,10 +33,10 @@ import (
 	"time"
 
 	"github.com/djherbis/atime"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/disk"
 	"github.com/minio/sio"
 )
diff --git a/cmd/disk-cache-check-support_other.go b/legacy/disk-cache-check-support_other.go
similarity index 98%
rename from cmd/disk-cache-check-support_other.go
rename to legacy/disk-cache-check-support_other.go
index f28b09c..c04f80d 100644
--- a/cmd/disk-cache-check-support_other.go
+++ b/legacy/disk-cache-check-support_other.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/disk-cache-check-support_windows.go b/legacy/disk-cache-check-support_windows.go
similarity index 98%
rename from cmd/disk-cache-check-support_windows.go
rename to legacy/disk-cache-check-support_windows.go
index bf8ac21..7b3ce0e 100644
--- a/cmd/disk-cache-check-support_windows.go
+++ b/legacy/disk-cache-check-support_windows.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/disk-cache-stats.go b/legacy/disk-cache-stats.go
similarity index 99%
rename from cmd/disk-cache-stats.go
rename to legacy/disk-cache-stats.go
index 2cf15fa..4b98809 100644
--- a/cmd/disk-cache-stats.go
+++ b/legacy/disk-cache-stats.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"sync/atomic"
diff --git a/cmd/disk-cache-utils.go b/legacy/disk-cache-utils.go
similarity index 99%
rename from cmd/disk-cache-utils.go
rename to legacy/disk-cache-utils.go
index 6a11a88..f880c7d 100644
--- a/cmd/disk-cache-utils.go
+++ b/legacy/disk-cache-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"container/list"
@@ -29,7 +29,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 )
 
 // CacheStatusType - whether the request was served from cache.
diff --git a/cmd/disk-cache-utils_test.go b/legacy/disk-cache-utils_test.go
similarity index 99%
rename from cmd/disk-cache-utils_test.go
rename to legacy/disk-cache-utils_test.go
index 8de7b45..c2e577d 100644
--- a/cmd/disk-cache-utils_test.go
+++ b/legacy/disk-cache-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/disk-cache.go b/legacy/disk-cache.go
similarity index 99%
rename from cmd/disk-cache.go
rename to legacy/disk-cache.go
index e66a542..290c536 100644
--- a/cmd/disk-cache.go
+++ b/legacy/disk-cache.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -27,8 +27,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/logger"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/sync/errgroup"
diff --git a/cmd/disk-cache_test.go b/legacy/disk-cache_test.go
similarity index 99%
rename from cmd/disk-cache_test.go
rename to legacy/disk-cache_test.go
index 1a35d18..c481cd7 100644
--- a/cmd/disk-cache_test.go
+++ b/legacy/disk-cache_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/dummy-data-generator_test.go b/legacy/dummy-data-generator_test.go
similarity index 99%
rename from cmd/dummy-data-generator_test.go
rename to legacy/dummy-data-generator_test.go
index 052d852..b38057c 100644
--- a/cmd/dummy-data-generator_test.go
+++ b/legacy/dummy-data-generator_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/dummy-handlers.go b/legacy/dummy-handlers.go
similarity index 99%
rename from cmd/dummy-handlers.go
rename to legacy/dummy-handlers.go
index 2d33e71..f89e334 100644
--- a/cmd/dummy-handlers.go
+++ b/legacy/dummy-handlers.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/dynamic-timeouts.go b/legacy/dynamic-timeouts.go
similarity index 99%
rename from cmd/dynamic-timeouts.go
rename to legacy/dynamic-timeouts.go
index 4116141..b3352ab 100644
--- a/cmd/dynamic-timeouts.go
+++ b/legacy/dynamic-timeouts.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"sync"
diff --git a/cmd/dynamic-timeouts_test.go b/legacy/dynamic-timeouts_test.go
similarity index 99%
rename from cmd/dynamic-timeouts_test.go
rename to legacy/dynamic-timeouts_test.go
index 699c7f8..04ef470 100644
--- a/cmd/dynamic-timeouts_test.go
+++ b/legacy/dynamic-timeouts_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"math/rand"
diff --git a/cmd/encryption-v1.go b/legacy/encryption-v1.go
similarity index 99%
rename from cmd/encryption-v1.go
rename to legacy/encryption-v1.go
index 789f40e..ace958a 100644
--- a/cmd/encryption-v1.go
+++ b/legacy/encryption-v1.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -32,8 +32,8 @@ import (
 	"strings"
 
 	"github.com/minio/minio-go/v6/pkg/encrypt"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"github.com/minio/sio"
 )
diff --git a/cmd/encryption-v1_test.go b/legacy/encryption-v1_test.go
similarity index 99%
rename from cmd/encryption-v1_test.go
rename to legacy/encryption-v1_test.go
index 75ca56a..f785aa2 100644
--- a/cmd/encryption-v1_test.go
+++ b/legacy/encryption-v1_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -24,7 +24,7 @@ import (
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/minio/minio-go/v6/pkg/encrypt"
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 	"github.com/minio/sio"
 )
 
diff --git a/cmd/endpoint-ellipses.go b/legacy/endpoint-ellipses.go
similarity index 99%
rename from cmd/endpoint-ellipses.go
rename to legacy/endpoint-ellipses.go
index 92e8b22..0203639 100644
--- a/cmd/endpoint-ellipses.go
+++ b/legacy/endpoint-ellipses.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/ellipses"
 	"github.com/minio/minio/pkg/env"
 )
diff --git a/cmd/endpoint-ellipses_test.go b/legacy/endpoint-ellipses_test.go
similarity index 99%
rename from cmd/endpoint-ellipses_test.go
rename to legacy/endpoint-ellipses_test.go
index 14cf07f..ef88e54 100644
--- a/cmd/endpoint-ellipses_test.go
+++ b/legacy/endpoint-ellipses_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/endpoint.go b/legacy/endpoint.go
similarity index 99%
rename from cmd/endpoint.go
rename to legacy/endpoint.go
index 9a3e4dc..b240f03 100644
--- a/cmd/endpoint.go
+++ b/legacy/endpoint.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
@@ -29,8 +29,8 @@ import (
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/mountinfo"
 )
diff --git a/cmd/endpoint_test.go b/legacy/endpoint_test.go
similarity index 99%
rename from cmd/endpoint_test.go
rename to legacy/endpoint_test.go
index e562211..620951b 100644
--- a/cmd/endpoint_test.go
+++ b/legacy/endpoint_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/erasure-decode.go b/legacy/erasure-decode.go
similarity index 99%
rename from cmd/erasure-decode.go
rename to legacy/erasure-decode.go
index eddc55f..f2e43eb 100644
--- a/cmd/erasure-decode.go
+++ b/legacy/erasure-decode.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 var errHealRequired = errors.New("heal required")
diff --git a/cmd/erasure-decode_test.go b/legacy/erasure-decode_test.go
similarity index 99%
rename from cmd/erasure-decode_test.go
rename to legacy/erasure-decode_test.go
index f168b3c..6a975f2 100644
--- a/cmd/erasure-decode_test.go
+++ b/legacy/erasure-decode_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/erasure-encode.go b/legacy/erasure-encode.go
similarity index 98%
rename from cmd/erasure-encode.go
rename to legacy/erasure-encode.go
index f263b57..b829b7d 100644
--- a/cmd/erasure-encode.go
+++ b/legacy/erasure-encode.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 
 	"sync"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Writes in parallel to writers
diff --git a/cmd/erasure-encode_test.go b/legacy/erasure-encode_test.go
similarity index 99%
rename from cmd/erasure-encode_test.go
rename to legacy/erasure-encode_test.go
index 8fbe2da..115fd09 100644
--- a/cmd/erasure-encode_test.go
+++ b/legacy/erasure-encode_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/erasure-heal.go b/legacy/erasure-heal.go
similarity index 96%
rename from cmd/erasure-heal.go
rename to legacy/erasure-heal.go
index 947416a..b1b124a 100644
--- a/cmd/erasure-heal.go
+++ b/legacy/erasure-heal.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"io"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Heal heals the shard files on non-nil writers. Note that the quorum passed is 1
diff --git a/cmd/erasure-heal_test.go b/legacy/erasure-heal_test.go
similarity index 99%
rename from cmd/erasure-heal_test.go
rename to legacy/erasure-heal_test.go
index 5ab0e23..6034921 100644
--- a/cmd/erasure-heal_test.go
+++ b/legacy/erasure-heal_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/erasure-utils.go b/legacy/erasure-utils.go
similarity index 98%
rename from cmd/erasure-utils.go
rename to legacy/erasure-utils.go
index 2f844da..5d026cf 100644
--- a/cmd/erasure-utils.go
+++ b/legacy/erasure-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -22,7 +22,7 @@ import (
 	"io"
 
 	"github.com/klauspost/reedsolomon"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // getDataBlockLen - get length of data blocks from encoded blocks.
diff --git a/cmd/erasure.go b/legacy/erasure.go
similarity index 98%
rename from cmd/erasure.go
rename to legacy/erasure.go
index 4a6f31a..1dfaf4f 100644
--- a/cmd/erasure.go
+++ b/legacy/erasure.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"sync"
 
 	"github.com/klauspost/reedsolomon"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Erasure - erasure encoding details.
diff --git a/cmd/erasure_test.go b/legacy/erasure_test.go
similarity index 99%
rename from cmd/erasure_test.go
rename to legacy/erasure_test.go
index 4caa6f5..2064bfa 100644
--- a/cmd/erasure_test.go
+++ b/legacy/erasure_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/etcd.go b/legacy/etcd.go
similarity index 99%
rename from cmd/etcd.go
rename to legacy/etcd.go
index d3cc83a..8dcaff2 100644
--- a/cmd/etcd.go
+++ b/legacy/etcd.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/fallocate.go b/legacy/fallocate.go
similarity index 98%
rename from cmd/fallocate.go
rename to legacy/fallocate.go
index 67046ca..8d33728 100644
--- a/cmd/fallocate.go
+++ b/legacy/fallocate.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // Fallocate is not POSIX and not supported under Windows
 // Always return successful
diff --git a/cmd/fallocate_linux.go b/legacy/fallocate_linux.go
similarity index 98%
rename from cmd/fallocate_linux.go
rename to legacy/fallocate_linux.go
index 89ea8ee..575fec2 100644
--- a/cmd/fallocate_linux.go
+++ b/legacy/fallocate_linux.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "syscall"
 
diff --git a/cmd/fallocate_linux_test.go b/legacy/fallocate_linux_test.go
similarity index 98%
rename from cmd/fallocate_linux_test.go
rename to legacy/fallocate_linux_test.go
index ee95f21..3f8d1a4 100644
--- a/cmd/fallocate_linux_test.go
+++ b/legacy/fallocate_linux_test.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "testing"
 
diff --git a/cmd/fastwalk.go b/legacy/fastwalk.go
similarity index 98%
rename from cmd/fastwalk.go
rename to legacy/fastwalk.go
index 2096982..14d6a01 100644
--- a/cmd/fastwalk.go
+++ b/legacy/fastwalk.go
@@ -6,7 +6,7 @@
 // only fastwalk.go is imported since we already implement readDir()
 // with some little tweaks.
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/format-disk-cache.go b/legacy/format-disk-cache.go
similarity index 99%
rename from cmd/format-disk-cache.go
rename to legacy/format-disk-cache.go
index 3dec6e5..8636b90 100644
--- a/cmd/format-disk-cache.go
+++ b/legacy/format-disk-cache.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"strings"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/sio"
 )
 
diff --git a/cmd/format-disk-cache_test.go b/legacy/format-disk-cache_test.go
similarity index 99%
rename from cmd/format-disk-cache_test.go
rename to legacy/format-disk-cache_test.go
index 9e64674..a6f4376 100644
--- a/cmd/format-disk-cache_test.go
+++ b/legacy/format-disk-cache_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/format-fs.go b/legacy/format-fs.go
similarity index 99%
rename from cmd/format-fs.go
rename to legacy/format-fs.go
index 1fab6dc..9db020b 100644
--- a/cmd/format-fs.go
+++ b/legacy/format-fs.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -24,8 +24,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/lock"
 	"github.com/minio/minio/pkg/retry"
 )
diff --git a/cmd/format-fs_test.go b/legacy/format-fs_test.go
similarity index 99%
rename from cmd/format-fs_test.go
rename to legacy/format-fs_test.go
index dc9f187..4dc0ce4 100644
--- a/cmd/format-fs_test.go
+++ b/legacy/format-fs_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/format-meta.go b/legacy/format-meta.go
similarity index 99%
rename from cmd/format-meta.go
rename to legacy/format-meta.go
index 8c42fd3..119abf5 100644
--- a/cmd/format-meta.go
+++ b/legacy/format-meta.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // Format related consts
 const (
diff --git a/cmd/format-xl.go b/legacy/format-xl.go
similarity index 99%
rename from cmd/format-xl.go
rename to legacy/format-xl.go
index 8d7ad9f..50bb6d7 100644
--- a/cmd/format-xl.go
+++ b/legacy/format-xl.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,9 +27,9 @@ import (
 	"sync"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/sync/errgroup"
 	sha256 "github.com/minio/sha256-simd"
diff --git a/cmd/format-xl_test.go b/legacy/format-xl_test.go
similarity index 99%
rename from cmd/format-xl_test.go
rename to legacy/format-xl_test.go
index 10f5add..88534f0 100644
--- a/cmd/format-xl_test.go
+++ b/legacy/format-xl_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
diff --git a/cmd/fs-v1-helpers.go b/legacy/fs-v1-helpers.go
similarity index 99%
rename from cmd/fs-v1-helpers.go
rename to legacy/fs-v1-helpers.go
index b312a5a..2df5d4b 100644
--- a/cmd/fs-v1-helpers.go
+++ b/legacy/fs-v1-helpers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	pathutil "path"
 	"runtime"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/lock"
 )
 
diff --git a/cmd/fs-v1-helpers_test.go b/legacy/fs-v1-helpers_test.go
similarity index 99%
rename from cmd/fs-v1-helpers_test.go
rename to legacy/fs-v1-helpers_test.go
index 972616c..37babce 100644
--- a/cmd/fs-v1-helpers_test.go
+++ b/legacy/fs-v1-helpers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/fs-v1-metadata.go b/legacy/fs-v1-metadata.go
similarity index 98%
rename from cmd/fs-v1-metadata.go
rename to legacy/fs-v1-metadata.go
index b1e108a..0e097ca 100644
--- a/cmd/fs-v1-metadata.go
+++ b/legacy/fs-v1-metadata.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -28,8 +28,8 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/lock"
 	"github.com/minio/minio/pkg/mimedb"
 )
diff --git a/cmd/fs-v1-metadata_test.go b/legacy/fs-v1-metadata_test.go
similarity index 99%
rename from cmd/fs-v1-metadata_test.go
rename to legacy/fs-v1-metadata_test.go
index 1d8cb7b..0947569 100644
--- a/cmd/fs-v1-metadata_test.go
+++ b/legacy/fs-v1-metadata_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/fs-v1-multipart.go b/legacy/fs-v1-multipart.go
similarity index 99%
rename from cmd/fs-v1-multipart.go
rename to legacy/fs-v1-multipart.go
index 9cf8c37..e0d0b2d 100644
--- a/cmd/fs-v1-multipart.go
+++ b/legacy/fs-v1-multipart.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	mioutil "github.com/minio/minio/pkg/ioutil"
 )
 
diff --git a/cmd/fs-v1-multipart_test.go b/legacy/fs-v1-multipart_test.go
similarity index 99%
rename from cmd/fs-v1-multipart_test.go
rename to legacy/fs-v1-multipart_test.go
index 91d947f..191e776 100644
--- a/cmd/fs-v1-multipart_test.go
+++ b/legacy/fs-v1-multipart_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/fs-v1-rwpool.go b/legacy/fs-v1-rwpool.go
similarity index 99%
rename from cmd/fs-v1-rwpool.go
rename to legacy/fs-v1-rwpool.go
index 6c5eb1b..74325ef 100644
--- a/cmd/fs-v1-rwpool.go
+++ b/legacy/fs-v1-rwpool.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
 	pathutil "path"
 	"sync"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/lock"
 )
 
diff --git a/cmd/fs-v1-rwpool_test.go b/legacy/fs-v1-rwpool_test.go
similarity index 99%
rename from cmd/fs-v1-rwpool_test.go
rename to legacy/fs-v1-rwpool_test.go
index f648ab8..304af2f 100644
--- a/cmd/fs-v1-rwpool_test.go
+++ b/legacy/fs-v1-rwpool_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/fs-v1.go b/legacy/fs-v1.go
similarity index 99%
rename from cmd/fs-v1.go
rename to legacy/fs-v1.go
index 99f292b..df721b7 100644
--- a/cmd/fs-v1.go
+++ b/legacy/fs-v1.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -35,9 +35,9 @@ import (
 	jsoniter "github.com/json-iterator/go"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/lock"
diff --git a/cmd/fs-v1_test.go b/legacy/fs-v1_test.go
similarity index 99%
rename from cmd/fs-v1_test.go
rename to legacy/fs-v1_test.go
index 62da095..50a02ae 100644
--- a/cmd/fs-v1_test.go
+++ b/legacy/fs-v1_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/gateway-common.go b/legacy/gateway-common.go
similarity index 98%
rename from cmd/gateway-common.go
rename to legacy/gateway-common.go
index 0c31952..75509b2 100644
--- a/cmd/gateway-common.go
+++ b/legacy/gateway-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,9 +22,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/hash"
 	xnet "github.com/minio/minio/pkg/net"
diff --git a/cmd/gateway-common_test.go b/legacy/gateway-common_test.go
similarity index 98%
rename from cmd/gateway-common_test.go
rename to legacy/gateway-common_test.go
index 6bb14c7..61b1dbc 100644
--- a/cmd/gateway-common_test.go
+++ b/legacy/gateway-common_test.go
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cmd
+package legacy
 
 import (
 	"reflect"
diff --git a/cmd/gateway-env.go b/legacy/gateway-env.go
similarity index 98%
rename from cmd/gateway-env.go
rename to legacy/gateway-env.go
index 5337de4..e3a823d 100644
--- a/cmd/gateway-env.go
+++ b/legacy/gateway-env.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 type gatewaySSE []string
 
diff --git a/cmd/gateway-interface.go b/legacy/gateway-interface.go
similarity index 98%
rename from cmd/gateway-interface.go
rename to legacy/gateway-interface.go
index 4b92dcc..22caf49 100644
--- a/cmd/gateway-interface.go
+++ b/legacy/gateway-interface.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"github.com/minio/minio/pkg/auth"
diff --git a/cmd/gateway-main.go b/legacy/gateway-main.go
similarity index 98%
rename from cmd/gateway-main.go
rename to legacy/gateway-main.go
index 7500e71..6e1dbd8 100644
--- a/cmd/gateway-main.go
+++ b/legacy/gateway-main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -28,9 +28,9 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio/cli"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/certs"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/env"
diff --git a/cmd/gateway-main_test.go b/legacy/gateway-main_test.go
similarity index 99%
rename from cmd/gateway-main_test.go
rename to legacy/gateway-main_test.go
index ddef8f7..dd45fe9 100644
--- a/cmd/gateway-main_test.go
+++ b/legacy/gateway-main_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/gateway-metrics.go b/legacy/gateway-metrics.go
similarity index 99%
rename from cmd/gateway-metrics.go
rename to legacy/gateway-metrics.go
index 3f9746f..41da771 100644
--- a/cmd/gateway-metrics.go
+++ b/legacy/gateway-metrics.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/gateway-startup-msg.go b/legacy/gateway-startup-msg.go
similarity index 99%
rename from cmd/gateway-startup-msg.go
rename to legacy/gateway-startup-msg.go
index 4ac915f..17d6b89 100644
--- a/cmd/gateway-startup-msg.go
+++ b/legacy/gateway-startup-msg.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/gateway-startup-msg_test.go b/legacy/gateway-startup-msg_test.go
similarity index 98%
rename from cmd/gateway-startup-msg_test.go
rename to legacy/gateway-startup-msg_test.go
index 0bb1734..55da980 100644
--- a/cmd/gateway-startup-msg_test.go
+++ b/legacy/gateway-startup-msg_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/gateway-unsupported.go b/legacy/gateway-unsupported.go
similarity index 99%
rename from cmd/gateway-unsupported.go
rename to legacy/gateway-unsupported.go
index a860a5e..51dad75 100644
--- a/cmd/gateway-unsupported.go
+++ b/legacy/gateway-unsupported.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"errors"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
 	bucketsse "github.com/minio/minio/pkg/bucket/encryption"
diff --git a/cmd/generic-handlers.go b/legacy/generic-handlers.go
similarity index 99%
rename from cmd/generic-handlers.go
rename to legacy/generic-handlers.go
index 0b07ac6..8d29844 100644
--- a/cmd/generic-handlers.go
+++ b/legacy/generic-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
@@ -24,11 +24,11 @@ import (
 	"github.com/minio/minio-go/v6/pkg/set"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/http/stats"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/http/stats"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 	"github.com/minio/minio/pkg/wildcard"
 	"github.com/rs/cors"
diff --git a/cmd/generic-handlers_test.go b/legacy/generic-handlers_test.go
similarity index 99%
rename from cmd/generic-handlers_test.go
rename to legacy/generic-handlers_test.go
index b91ce28..b1a18db 100644
--- a/cmd/generic-handlers_test.go
+++ b/legacy/generic-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 )
 
 // Tests getRedirectLocation function for all its criteria.
diff --git a/cmd/global-heal.go b/legacy/global-heal.go
similarity index 99%
rename from cmd/global-heal.go
rename to legacy/global-heal.go
index 8904eca..b80435a 100644
--- a/cmd/global-heal.go
+++ b/legacy/global-heal.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/globals.go b/legacy/globals.go
similarity index 95%
rename from cmd/globals.go
rename to legacy/globals.go
index fae732f..fbb23ad 100644
--- a/cmd/globals.go
+++ b/legacy/globals.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/x509"
@@ -25,15 +25,15 @@ import (
 
 	etcd "github.com/coreos/etcd/clientv3"
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/compress"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/auth"
 
 	"github.com/minio/minio/pkg/certs"
diff --git a/cmd/handler-api.go b/legacy/handler-api.go
similarity index 97%
rename from cmd/handler-api.go
rename to legacy/handler-api.go
index f946a43..324652b 100644
--- a/cmd/handler-api.go
+++ b/legacy/handler-api.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/config/api"
+	"github.com/minio/minio/legacy/config/api"
 )
 
 type apiConfig struct {
diff --git a/cmd/handler-utils.go b/legacy/handler-utils.go
similarity index 99%
rename from cmd/handler-utils.go
rename to legacy/handler-utils.go
index 1599e35..72b17db 100644
--- a/cmd/handler-utils.go
+++ b/legacy/handler-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,8 +30,8 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/handlers"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/handler-utils_test.go b/legacy/handler-utils_test.go
similarity index 99%
rename from cmd/handler-utils_test.go
rename to legacy/handler-utils_test.go
index a519cba..8d4c86b 100644
--- a/cmd/handler-utils_test.go
+++ b/legacy/handler-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Tests validate bucket LocationConstraint.
diff --git a/cmd/hasher.go b/legacy/hasher.go
similarity index 98%
rename from cmd/hasher.go
rename to legacy/hasher.go
index bac821e..e6b6e43 100644
--- a/cmd/hasher.go
+++ b/legacy/hasher.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/md5"
diff --git a/cmd/healthcheck-handler.go b/legacy/healthcheck-handler.go
similarity index 99%
rename from cmd/healthcheck-handler.go
rename to legacy/healthcheck-handler.go
index 8591846..c3f39af 100644
--- a/cmd/healthcheck-handler.go
+++ b/legacy/healthcheck-handler.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/healthcheck-router.go b/legacy/healthcheck-router.go
similarity index 99%
rename from cmd/healthcheck-router.go
rename to legacy/healthcheck-router.go
index cb4a6ad..4f3f95c 100644
--- a/cmd/healthcheck-router.go
+++ b/legacy/healthcheck-router.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/http-stats.go b/legacy/http-stats.go
similarity index 98%
rename from cmd/http-stats.go
rename to legacy/http-stats.go
index ec88f28..f167038 100644
--- a/cmd/http-stats.go
+++ b/legacy/http-stats.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
@@ -22,7 +22,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/cmd/http-tracer.go b/legacy/http-tracer.go
similarity index 97%
rename from cmd/http-tracer.go
rename to legacy/http-tracer.go
index 01ac76a..73fa211 100644
--- a/cmd/http-tracer.go
+++ b/legacy/http-tracer.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 	trace "github.com/minio/minio/pkg/trace"
 )
@@ -80,7 +80,7 @@ func (r *recordRequest) Data() []byte {
 
 // getOpName sanitizes the operation name for mc
 func getOpName(name string) (op string) {
-	op = strings.TrimPrefix(name, "github.com/minio/minio/cmd.")
+	op = strings.TrimPrefix(name, "github.com/minio/minio/legacy.")
 	op = strings.TrimSuffix(op, "Handler-fm")
 	op = strings.Replace(op, "objectAPIHandlers", "s3", 1)
 	op = strings.Replace(op, "webAPIHandlers", "webui", 1)
diff --git a/cmd/http/close.go b/legacy/http/close.go
similarity index 100%
rename from cmd/http/close.go
rename to legacy/http/close.go
diff --git a/cmd/http/dial_linux.go b/legacy/http/dial_linux.go
similarity index 100%
rename from cmd/http/dial_linux.go
rename to legacy/http/dial_linux.go
diff --git a/cmd/http/dial_others.go b/legacy/http/dial_others.go
similarity index 100%
rename from cmd/http/dial_others.go
rename to legacy/http/dial_others.go
diff --git a/cmd/http/headers.go b/legacy/http/headers.go
similarity index 100%
rename from cmd/http/headers.go
rename to legacy/http/headers.go
diff --git a/cmd/http/listen_nix.go b/legacy/http/listen_nix.go
similarity index 100%
rename from cmd/http/listen_nix.go
rename to legacy/http/listen_nix.go
diff --git a/cmd/http/listen_others.go b/legacy/http/listen_others.go
similarity index 100%
rename from cmd/http/listen_others.go
rename to legacy/http/listen_others.go
diff --git a/cmd/http/listener.go b/legacy/http/listener.go
similarity index 100%
rename from cmd/http/listener.go
rename to legacy/http/listener.go
diff --git a/cmd/http/listener_test.go b/legacy/http/listener_test.go
similarity index 100%
rename from cmd/http/listener_test.go
rename to legacy/http/listener_test.go
diff --git a/cmd/http/server.go b/legacy/http/server.go
similarity index 100%
rename from cmd/http/server.go
rename to legacy/http/server.go
diff --git a/cmd/http/server_test.go b/legacy/http/server_test.go
similarity index 100%
rename from cmd/http/server_test.go
rename to legacy/http/server_test.go
diff --git a/cmd/http/stats/http-traffic-recorder.go b/legacy/http/stats/http-traffic-recorder.go
similarity index 100%
rename from cmd/http/stats/http-traffic-recorder.go
rename to legacy/http/stats/http-traffic-recorder.go
diff --git a/cmd/httprange.go b/legacy/httprange.go
similarity index 99%
rename from cmd/httprange.go
rename to legacy/httprange.go
index 145e54f..715ba0b 100644
--- a/cmd/httprange.go
+++ b/legacy/httprange.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/httprange_test.go b/legacy/httprange_test.go
similarity index 99%
rename from cmd/httprange_test.go
rename to legacy/httprange_test.go
index ee0b9a5..dfb0361 100644
--- a/cmd/httprange_test.go
+++ b/legacy/httprange_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/iam-etcd-store.go b/legacy/iam-etcd-store.go
similarity index 99%
rename from cmd/iam-etcd-store.go
rename to legacy/iam-etcd-store.go
index 4c2f20f..02238e5 100644
--- a/cmd/iam-etcd-store.go
+++ b/legacy/iam-etcd-store.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,7 +30,7 @@ import (
 	"github.com/coreos/etcd/mvcc/mvccpb"
 	jwtgo "github.com/dgrijalva/jwt-go"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/iam-object-store.go b/legacy/iam-object-store.go
similarity index 99%
rename from cmd/iam-object-store.go
rename to legacy/iam-object-store.go
index b27d1ad..05ed3ae 100644
--- a/cmd/iam-object-store.go
+++ b/legacy/iam-object-store.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,7 +27,7 @@ import (
 
 	jwtgo "github.com/dgrijalva/jwt-go"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/iam.go b/legacy/iam.go
similarity index 99%
rename from cmd/iam.go
rename to legacy/iam.go
index 18081ae..8a7b26e 100644
--- a/cmd/iam.go
+++ b/legacy/iam.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,8 +27,8 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/jwt.go b/legacy/jwt.go
similarity index 98%
rename from cmd/jwt.go
rename to legacy/jwt.go
index 63af66c..0a0e38b 100644
--- a/cmd/jwt.go
+++ b/legacy/jwt.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
@@ -23,8 +23,8 @@ import (
 
 	jwtgo "github.com/dgrijalva/jwt-go"
 	jwtreq "github.com/dgrijalva/jwt-go/request"
-	xjwt "github.com/minio/minio/cmd/jwt"
-	"github.com/minio/minio/cmd/logger"
+	xjwt "github.com/minio/minio/legacy/jwt"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 )
 
diff --git a/cmd/jwt/parser.go b/legacy/jwt/parser.go
similarity index 100%
rename from cmd/jwt/parser.go
rename to legacy/jwt/parser.go
diff --git a/cmd/jwt/parser_test.go b/legacy/jwt/parser_test.go
similarity index 100%
rename from cmd/jwt/parser_test.go
rename to legacy/jwt/parser_test.go
diff --git a/cmd/jwt_test.go b/legacy/jwt_test.go
similarity index 98%
rename from cmd/jwt_test.go
rename to legacy/jwt_test.go
index 685d7af..7100660 100644
--- a/cmd/jwt_test.go
+++ b/legacy/jwt_test.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"os"
 	"testing"
 
-	xjwt "github.com/minio/minio/cmd/jwt"
+	xjwt "github.com/minio/minio/legacy/jwt"
 	"github.com/minio/minio/pkg/auth"
 )
 
diff --git a/cmd/leak-detect_test.go b/legacy/leak-detect_test.go
similarity index 99%
rename from cmd/leak-detect_test.go
rename to legacy/leak-detect_test.go
index ca1aa42..ce9abc8 100644
--- a/cmd/leak-detect_test.go
+++ b/legacy/leak-detect_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package cmd
+package legacy
 
 import (
 	"runtime/debug"
diff --git a/cmd/local-locker.go b/legacy/local-locker.go
similarity index 99%
rename from cmd/local-locker.go
rename to legacy/local-locker.go
index 707613e..6bbc740 100644
--- a/cmd/local-locker.go
+++ b/legacy/local-locker.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/lock-rest-client.go b/legacy/lock-rest-client.go
similarity index 96%
rename from cmd/lock-rest-client.go
rename to legacy/lock-rest-client.go
index 61e9937..ddf58a4 100644
--- a/cmd/lock-rest-client.go
+++ b/legacy/lock-rest-client.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -24,10 +24,10 @@ import (
 	"io"
 	"net/url"
 
-	"github.com/minio/minio/cmd/http"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	"github.com/minio/minio/legacy/http"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 	"github.com/minio/minio/pkg/dsync"
 )
 
diff --git a/cmd/lock-rest-client_test.go b/legacy/lock-rest-client_test.go
similarity index 98%
rename from cmd/lock-rest-client_test.go
rename to legacy/lock-rest-client_test.go
index d05659c..116f10b 100644
--- a/cmd/lock-rest-client_test.go
+++ b/legacy/lock-rest-client_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/lock-rest-server-common.go b/legacy/lock-rest-server-common.go
similarity index 98%
rename from cmd/lock-rest-server-common.go
rename to legacy/lock-rest-server-common.go
index 15b10e5..3d06390 100644
--- a/cmd/lock-rest-server-common.go
+++ b/legacy/lock-rest-server-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/lock-rest-server-common_test.go b/legacy/lock-rest-server-common_test.go
similarity index 99%
rename from cmd/lock-rest-server-common_test.go
rename to legacy/lock-rest-server-common_test.go
index 150027b..55c1901 100644
--- a/cmd/lock-rest-server-common_test.go
+++ b/legacy/lock-rest-server-common_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/lock-rest-server.go b/legacy/lock-rest-server.go
similarity index 99%
rename from cmd/lock-rest-server.go
rename to legacy/lock-rest-server.go
index 857f37d..ba1acdf 100644
--- a/cmd/lock-rest-server.go
+++ b/legacy/lock-rest-server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
diff --git a/cmd/logger/audit.go b/legacy/logger/audit.go
similarity index 98%
rename from cmd/logger/audit.go
rename to legacy/logger/audit.go
index 9883f9f..0ccd17e 100644
--- a/cmd/logger/audit.go
+++ b/legacy/logger/audit.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger/message/audit"
+	"github.com/minio/minio/legacy/logger/message/audit"
 )
 
 // ResponseWriter - is a wrapper to trap the http response status code.
diff --git a/cmd/logger/config.go b/legacy/logger/config.go
similarity index 99%
rename from cmd/logger/config.go
rename to legacy/logger/config.go
index dc520f8..ae3ddd6 100644
--- a/cmd/logger/config.go
+++ b/legacy/logger/config.go
@@ -19,7 +19,7 @@ package logger
 import (
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/logger/console.go b/legacy/logger/console.go
similarity index 98%
rename from cmd/logger/console.go
rename to legacy/logger/console.go
index 5ea2225..e292c2d 100644
--- a/cmd/logger/console.go
+++ b/legacy/logger/console.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/logger/message/log"
 	"github.com/minio/minio/pkg/color"
 	c "github.com/minio/minio/pkg/console"
 )
diff --git a/cmd/logger/help.go b/legacy/logger/help.go
similarity index 97%
rename from cmd/logger/help.go
rename to legacy/logger/help.go
index e625c4c..451ca76 100644
--- a/cmd/logger/help.go
+++ b/legacy/logger/help.go
@@ -16,7 +16,7 @@
 
 package logger
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for logger http and audit
 var (
diff --git a/cmd/logger/legacy.go b/legacy/logger/legacy.go
similarity index 97%
rename from cmd/logger/legacy.go
rename to legacy/logger/legacy.go
index 0d37a66..2a3ac46 100644
--- a/cmd/logger/legacy.go
+++ b/legacy/logger/legacy.go
@@ -16,7 +16,7 @@
 
 package logger
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Legacy envs
 const (
diff --git a/cmd/logger/logger.go b/legacy/logger/logger.go
similarity index 99%
rename from cmd/logger/logger.go
rename to legacy/logger/logger.go
index 8ecbbb6..47d363c 100644
--- a/cmd/logger/logger.go
+++ b/legacy/logger/logger.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/minio/highwayhash"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/logger/message/log"
 )
 
 var (
diff --git a/cmd/logger/logonce.go b/legacy/logger/logonce.go
similarity index 100%
rename from cmd/logger/logonce.go
rename to legacy/logger/logonce.go
diff --git a/cmd/logger/message/audit/entry.go b/legacy/logger/message/audit/entry.go
similarity index 98%
rename from cmd/logger/message/audit/entry.go
rename to legacy/logger/message/audit/entry.go
index 7f9fff3..f1c7a96 100644
--- a/cmd/logger/message/audit/entry.go
+++ b/legacy/logger/message/audit/entry.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/handlers"
 )
 
diff --git a/cmd/logger/message/log/entry.go b/legacy/logger/message/log/entry.go
similarity index 100%
rename from cmd/logger/message/log/entry.go
rename to legacy/logger/message/log/entry.go
diff --git a/cmd/logger/reqinfo.go b/legacy/logger/reqinfo.go
similarity index 100%
rename from cmd/logger/reqinfo.go
rename to legacy/logger/reqinfo.go
diff --git a/cmd/logger/target/console/console.go b/legacy/logger/target/console/console.go
similarity index 97%
rename from cmd/logger/target/console/console.go
rename to legacy/logger/target/console/console.go
index 74e0c7b..042f9c2 100644
--- a/cmd/logger/target/console/console.go
+++ b/legacy/logger/target/console/console.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/console"
 )
diff --git a/cmd/logger/target/http/http.go b/legacy/logger/target/http/http.go
similarity index 98%
rename from cmd/logger/target/http/http.go
rename to legacy/logger/target/http/http.go
index b777a01..cfb39a5 100644
--- a/cmd/logger/target/http/http.go
+++ b/legacy/logger/target/http/http.go
@@ -23,7 +23,7 @@ import (
 	"net/http"
 	"strings"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // Target implements logger.Target and sends the json
diff --git a/cmd/logger/targets.go b/legacy/logger/targets.go
similarity index 100%
rename from cmd/logger/targets.go
rename to legacy/logger/targets.go
diff --git a/cmd/logger/utils.go b/legacy/logger/utils.go
similarity index 100%
rename from cmd/logger/utils.go
rename to legacy/logger/utils.go
diff --git a/cmd/main.go b/legacy/main.go
similarity index 99%
rename from cmd/main.go
rename to legacy/main.go
index 0661faa..cac76da 100644
--- a/cmd/main.go
+++ b/legacy/main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/merge-walk-pool.go b/legacy/merge-walk-pool.go
similarity index 99%
rename from cmd/merge-walk-pool.go
rename to legacy/merge-walk-pool.go
index 8f34afa..a42b54e 100644
--- a/cmd/merge-walk-pool.go
+++ b/legacy/merge-walk-pool.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"reflect"
diff --git a/cmd/merge-walk-pool_test.go b/legacy/merge-walk-pool_test.go
similarity index 99%
rename from cmd/merge-walk-pool_test.go
rename to legacy/merge-walk-pool_test.go
index ee12716..207a08e 100644
--- a/cmd/merge-walk-pool_test.go
+++ b/legacy/merge-walk-pool_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/metrics-router.go b/legacy/metrics-router.go
similarity index 99%
rename from cmd/metrics-router.go
rename to legacy/metrics-router.go
index 3e26fe7..8997c9d 100644
--- a/cmd/metrics-router.go
+++ b/legacy/metrics-router.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/metrics.go b/legacy/metrics.go
similarity index 99%
rename from cmd/metrics.go
rename to legacy/metrics.go
index dd1ed16..c6c2080 100644
--- a/cmd/metrics.go
+++ b/legacy/metrics.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
@@ -22,8 +22,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/cmd/namespace-lock.go b/legacy/namespace-lock.go
similarity index 98%
rename from cmd/namespace-lock.go
rename to legacy/namespace-lock.go
index fd7547a..a4d14ac 100644
--- a/cmd/namespace-lock.go
+++ b/legacy/namespace-lock.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/dsync"
 	"github.com/minio/minio/pkg/lsync"
 )
@@ -263,7 +263,7 @@ func getSource(n int) string {
 	if ok {
 		filename = pathutil.Base(filename)
 		funcName = strings.TrimPrefix(runtime.FuncForPC(pc).Name(),
-			"github.com/minio/minio/cmd.")
+			"github.com/minio/minio/legacy.")
 	} else {
 		filename = "<unknown>"
 		lineNum = 0
diff --git a/cmd/namespace-lock_test.go b/legacy/namespace-lock_test.go
similarity index 99%
rename from cmd/namespace-lock_test.go
rename to legacy/namespace-lock_test.go
index 692fe43..70e5c41 100644
--- a/cmd/namespace-lock_test.go
+++ b/legacy/namespace-lock_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/naughty-disk_test.go b/legacy/naughty-disk_test.go
similarity index 99%
rename from cmd/naughty-disk_test.go
rename to legacy/naughty-disk_test.go
index 4ad8879..502ad6c 100644
--- a/cmd/naughty-disk_test.go
+++ b/legacy/naughty-disk_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/net.go b/legacy/net.go
similarity index 99%
rename from cmd/net.go
rename to legacy/net.go
index 5bbc535..ee84a5f 100644
--- a/cmd/net.go
+++ b/legacy/net.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
@@ -26,8 +26,8 @@ import (
 	"syscall"
 
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	xnet "github.com/minio/minio/pkg/net"
 )
 
diff --git a/cmd/net_test.go b/legacy/net_test.go
similarity index 99%
rename from cmd/net_test.go
rename to legacy/net_test.go
index 1b1903c..5ff2f83 100644
--- a/cmd/net_test.go
+++ b/legacy/net_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/notification.go b/legacy/notification.go
similarity index 99%
rename from cmd/notification.go
rename to legacy/notification.go
index 37fa8e3..c9d5d03 100644
--- a/cmd/notification.go
+++ b/legacy/notification.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,8 +30,8 @@ import (
 
 	"github.com/klauspost/compress/zip"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/obdinfo.go b/legacy/obdinfo.go
similarity index 99%
rename from cmd/obdinfo.go
rename to legacy/obdinfo.go
index 81d1a3d..672bfae 100644
--- a/cmd/obdinfo.go
+++ b/legacy/obdinfo.go
@@ -15,7 +15,7 @@
  *
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/obdinfo_other.go b/legacy/obdinfo_other.go
similarity index 99%
rename from cmd/obdinfo_other.go
rename to legacy/obdinfo_other.go
index edc9dc4..af0463e 100644
--- a/cmd/obdinfo_other.go
+++ b/legacy/obdinfo_other.go
@@ -17,7 +17,7 @@
  *
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/obdinfo_unix.go b/legacy/obdinfo_unix.go
similarity index 98%
rename from cmd/obdinfo_unix.go
rename to legacy/obdinfo_unix.go
index 02c8261..09529f6 100644
--- a/cmd/obdinfo_unix.go
+++ b/legacy/obdinfo_unix.go
@@ -17,7 +17,7 @@
  *
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/object-api-common.go b/legacy/object-api-common.go
similarity index 99%
rename from cmd/object-api-common.go
rename to legacy/object-api-common.go
index 6811d85..da9e040 100644
--- a/cmd/object-api-common.go
+++ b/legacy/object-api-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 const (
diff --git a/cmd/object-api-datatypes.go b/legacy/object-api-datatypes.go
similarity index 99%
rename from cmd/object-api-datatypes.go
rename to legacy/object-api-datatypes.go
index 926d306..ac6d36f 100644
--- a/cmd/object-api-datatypes.go
+++ b/legacy/object-api-datatypes.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io"
diff --git a/cmd/object-api-deleteobject_test.go b/legacy/object-api-deleteobject_test.go
similarity index 99%
rename from cmd/object-api-deleteobject_test.go
rename to legacy/object-api-deleteobject_test.go
index c3844fa..e82b21e 100644
--- a/cmd/object-api-deleteobject_test.go
+++ b/legacy/object-api-deleteobject_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-errors.go b/legacy/object-api-errors.go
similarity index 99%
rename from cmd/object-api-errors.go
rename to legacy/object-api-errors.go
index fdc09c9..336c201 100644
--- a/cmd/object-api-errors.go
+++ b/legacy/object-api-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/object-api-getobject_test.go b/legacy/object-api-getobject_test.go
similarity index 99%
rename from cmd/object-api-getobject_test.go
rename to legacy/object-api-getobject_test.go
index 3cded55..ea3ba31 100644
--- a/cmd/object-api-getobject_test.go
+++ b/legacy/object-api-getobject_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-getobjectinfo_test.go b/legacy/object-api-getobjectinfo_test.go
similarity index 99%
rename from cmd/object-api-getobjectinfo_test.go
rename to legacy/object-api-getobjectinfo_test.go
index ba44d9d..cc6354f 100644
--- a/cmd/object-api-getobjectinfo_test.go
+++ b/legacy/object-api-getobjectinfo_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-input-checks.go b/legacy/object-api-input-checks.go
similarity index 99%
rename from cmd/object-api-input-checks.go
rename to legacy/object-api-input-checks.go
index a663118..194c0f3 100644
--- a/cmd/object-api-input-checks.go
+++ b/legacy/object-api-input-checks.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Checks on GetObject arguments, bucket and object.
diff --git a/cmd/object-api-interface.go b/legacy/object-api-interface.go
similarity index 99%
rename from cmd/object-api-interface.go
rename to legacy/object-api-interface.go
index 2be7f22..a9ef3fa 100644
--- a/cmd/object-api-interface.go
+++ b/legacy/object-api-interface.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/object-api-listobjects_test.go b/legacy/object-api-listobjects_test.go
similarity index 99%
rename from cmd/object-api-listobjects_test.go
rename to legacy/object-api-listobjects_test.go
index a8f7c63..104cffb 100644
--- a/cmd/object-api-listobjects_test.go
+++ b/legacy/object-api-listobjects_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-multipart_test.go b/legacy/object-api-multipart_test.go
similarity index 99%
rename from cmd/object-api-multipart_test.go
rename to legacy/object-api-multipart_test.go
index 351a5c9..40ad47f 100644
--- a/cmd/object-api-multipart_test.go
+++ b/legacy/object-api-multipart_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-putobject_test.go b/legacy/object-api-putobject_test.go
similarity index 99%
rename from cmd/object-api-putobject_test.go
rename to legacy/object-api-putobject_test.go
index 9886d31..6d1989d 100644
--- a/cmd/object-api-putobject_test.go
+++ b/legacy/object-api-putobject_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-utils.go b/legacy/object-api-utils.go
similarity index 98%
rename from cmd/object-api-utils.go
rename to legacy/object-api-utils.go
index 4bec241..ca7defa 100644
--- a/cmd/object-api-utils.go
+++ b/legacy/object-api-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -37,12 +37,12 @@ import (
 	"github.com/klauspost/compress/s2"
 	"github.com/klauspost/readahead"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	"github.com/minio/minio/cmd/config/compress"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/hash"
 	"github.com/minio/minio/pkg/ioutil"
 	"github.com/minio/minio/pkg/wildcard"
diff --git a/cmd/object-api-utils_test.go b/legacy/object-api-utils_test.go
similarity index 99%
rename from cmd/object-api-utils_test.go
rename to legacy/object-api-utils_test.go
index 9a98e4b..cbc1185 100644
--- a/cmd/object-api-utils_test.go
+++ b/legacy/object-api-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,8 +25,8 @@ import (
 	"testing"
 
 	"github.com/klauspost/compress/s2"
-	"github.com/minio/minio/cmd/config/compress"
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/crypto"
 )
 
 // Tests validate bucket name.
diff --git a/cmd/object-handlers-common.go b/legacy/object-handlers-common.go
similarity index 99%
rename from cmd/object-handlers-common.go
rename to legacy/object-handlers-common.go
index 9d7ecb1..eb0c4db 100644
--- a/cmd/object-handlers-common.go
+++ b/legacy/object-handlers-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,8 +23,8 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/handlers"
 )
diff --git a/cmd/object-handlers-common_test.go b/legacy/object-handlers-common_test.go
similarity index 98%
rename from cmd/object-handlers-common_test.go
rename to legacy/object-handlers-common_test.go
index ef725c6..e3db4d7 100644
--- a/cmd/object-handlers-common_test.go
+++ b/legacy/object-handlers-common_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/object-handlers.go b/legacy/object-handlers.go
similarity index 99%
rename from cmd/object-handlers.go
rename to legacy/object-handlers.go
index d8d7404..ea72c35 100644
--- a/cmd/object-handlers.go
+++ b/legacy/object-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -35,11 +35,11 @@ import (
 	miniogo "github.com/minio/minio-go/v6"
 	"github.com/minio/minio-go/v6/pkg/encrypt"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
diff --git a/cmd/object-handlers_test.go b/legacy/object-handlers_test.go
similarity index 99%
rename from cmd/object-handlers_test.go
rename to legacy/object-handlers_test.go
index 5920295..4bc6d36 100644
--- a/cmd/object-handlers_test.go
+++ b/legacy/object-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -37,8 +37,8 @@ import (
 	"testing"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/auth"
 	ioutilx "github.com/minio/minio/pkg/ioutil"
 )
diff --git a/cmd/object_api_suite_test.go b/legacy/object_api_suite_test.go
similarity index 99%
rename from cmd/object_api_suite_test.go
rename to legacy/object_api_suite_test.go
index cd87643..73d9dad 100644
--- a/cmd/object_api_suite_test.go
+++ b/legacy/object_api_suite_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/os-dirent_fileino.go b/legacy/os-dirent_fileino.go
similarity index 98%
rename from cmd/os-dirent_fileino.go
rename to legacy/os-dirent_fileino.go
index 2a9104b..e96fc0b 100644
--- a/cmd/os-dirent_fileino.go
+++ b/legacy/os-dirent_fileino.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "syscall"
 
diff --git a/cmd/os-dirent_ino.go b/legacy/os-dirent_ino.go
similarity index 98%
rename from cmd/os-dirent_ino.go
rename to legacy/os-dirent_ino.go
index aa7ce45..a0fd766 100644
--- a/cmd/os-dirent_ino.go
+++ b/legacy/os-dirent_ino.go
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "syscall"
 
diff --git a/cmd/os-dirent_namelen_bsd.go b/legacy/os-dirent_namelen_bsd.go
similarity index 98%
rename from cmd/os-dirent_namelen_bsd.go
rename to legacy/os-dirent_namelen_bsd.go
index 6286f2e..cd3c832 100644
--- a/cmd/os-dirent_namelen_bsd.go
+++ b/legacy/os-dirent_namelen_bsd.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "syscall"
 
diff --git a/cmd/os-dirent_namelen_linux.go b/legacy/os-dirent_namelen_linux.go
similarity index 98%
rename from cmd/os-dirent_namelen_linux.go
rename to legacy/os-dirent_namelen_linux.go
index 00e56aa..9b18c55 100644
--- a/cmd/os-dirent_namelen_linux.go
+++ b/legacy/os-dirent_namelen_linux.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/os-readdir_other.go b/legacy/os-readdir_other.go
similarity index 99%
rename from cmd/os-readdir_other.go
rename to legacy/os-readdir_other.go
index febd16f..de2180f 100644
--- a/cmd/os-readdir_other.go
+++ b/legacy/os-readdir_other.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io"
diff --git a/cmd/os-readdir_test.go b/legacy/os-readdir_test.go
similarity index 99%
rename from cmd/os-readdir_test.go
rename to legacy/os-readdir_test.go
index 2c6afb2..ba1939e 100644
--- a/cmd/os-readdir_test.go
+++ b/legacy/os-readdir_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/os-readdir_unix.go b/legacy/os-readdir_unix.go
similarity index 99%
rename from cmd/os-readdir_unix.go
rename to legacy/os-readdir_unix.go
index 09494f7..82fa823 100644
--- a/cmd/os-readdir_unix.go
+++ b/legacy/os-readdir_unix.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/os-readdir_windows.go b/legacy/os-readdir_windows.go
similarity index 99%
rename from cmd/os-readdir_windows.go
rename to legacy/os-readdir_windows.go
index 377bf38..ac9f34d 100644
--- a/cmd/os-readdir_windows.go
+++ b/legacy/os-readdir_windows.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/os-reliable.go b/legacy/os-reliable.go
similarity index 99%
rename from cmd/os-reliable.go
rename to legacy/os-reliable.go
index c76709d..e9d515e 100644
--- a/cmd/os-reliable.go
+++ b/legacy/os-reliable.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/os-reliable_test.go b/legacy/os-reliable_test.go
similarity index 99%
rename from cmd/os-reliable_test.go
rename to legacy/os-reliable_test.go
index ba1b1a2..195ab01 100644
--- a/cmd/os-reliable_test.go
+++ b/legacy/os-reliable_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/peer-rest-client.go b/legacy/peer-rest-client.go
similarity index 99%
rename from cmd/peer-rest-client.go
rename to legacy/peer-rest-client.go
index 3745a68..d91af29 100644
--- a/cmd/peer-rest-client.go
+++ b/legacy/peer-rest-client.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -32,10 +32,10 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/http"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	"github.com/minio/minio/legacy/http"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"
 	xnet "github.com/minio/minio/pkg/net"
diff --git a/cmd/peer-rest-common.go b/legacy/peer-rest-common.go
similarity index 99%
rename from cmd/peer-rest-common.go
rename to legacy/peer-rest-common.go
index a264073..04b37be 100644
--- a/cmd/peer-rest-common.go
+++ b/legacy/peer-rest-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 const (
 	peerRESTVersion       = "v9"
diff --git a/cmd/peer-rest-server.go b/legacy/peer-rest-server.go
similarity index 99%
rename from cmd/peer-rest-server.go
rename to legacy/peer-rest-server.go
index da5b67c..1c5e45c 100644
--- a/cmd/peer-rest-server.go
+++ b/legacy/peer-rest-server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"
 	trace "github.com/minio/minio/pkg/trace"
diff --git a/cmd/policy_test.go b/legacy/policy_test.go
similarity index 99%
rename from cmd/policy_test.go
rename to legacy/policy_test.go
index 785a616..b1e1e4f 100644
--- a/cmd/policy_test.go
+++ b/legacy/policy_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"reflect"
diff --git a/cmd/posix-diskid-check.go b/legacy/posix-diskid-check.go
similarity index 99%
rename from cmd/posix-diskid-check.go
rename to legacy/posix-diskid-check.go
index abe5bd5..b0b3d3e 100644
--- a/cmd/posix-diskid-check.go
+++ b/legacy/posix-diskid-check.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/posix-errors.go b/legacy/posix-errors.go
similarity index 99%
rename from cmd/posix-errors.go
rename to legacy/posix-errors.go
index 6523332..036754b 100644
--- a/cmd/posix-errors.go
+++ b/legacy/posix-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/posix-errors_test.go b/legacy/posix-errors_test.go
similarity index 99%
rename from cmd/posix-errors_test.go
rename to legacy/posix-errors_test.go
index da4624b..8047ed7 100644
--- a/cmd/posix-errors_test.go
+++ b/legacy/posix-errors_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/posix.go b/legacy/posix.go
similarity index 99%
rename from cmd/posix.go
rename to legacy/posix.go
index 6d7dfae..eebaed6 100644
--- a/cmd/posix.go
+++ b/legacy/posix.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -39,7 +39,7 @@ import (
 	humanize "github.com/dustin/go-humanize"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/klauspost/readahead"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/disk"
 	xioutil "github.com/minio/minio/pkg/ioutil"
 	"github.com/minio/minio/pkg/mountinfo"
diff --git a/cmd/posix_test.go b/legacy/posix_test.go
similarity index 99%
rename from cmd/posix_test.go
rename to legacy/posix_test.go
index 0c3cb23..0d268a6 100644
--- a/cmd/posix_test.go
+++ b/legacy/posix_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/posix_unix_test.go b/legacy/posix_unix_test.go
similarity index 99%
rename from cmd/posix_unix_test.go
rename to legacy/posix_unix_test.go
index a6dedd8..df33473 100644
--- a/cmd/posix_unix_test.go
+++ b/legacy/posix_unix_test.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io/ioutil"
diff --git a/cmd/posix_windows_test.go b/legacy/posix_windows_test.go
similarity index 99%
rename from cmd/posix_windows_test.go
rename to legacy/posix_windows_test.go
index 2ae38d8..8c7af83 100644
--- a/cmd/posix_windows_test.go
+++ b/legacy/posix_windows_test.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/post-policy_test.go b/legacy/post-policy_test.go
similarity index 99%
rename from cmd/post-policy_test.go
rename to legacy/post-policy_test.go
index 005b22a..0209f68 100644
--- a/cmd/post-policy_test.go
+++ b/legacy/post-policy_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/postpolicyform.go b/legacy/postpolicyform.go
similarity index 99%
rename from cmd/postpolicyform.go
rename to legacy/postpolicyform.go
index 69889b4..2deb88f 100644
--- a/cmd/postpolicyform.go
+++ b/legacy/postpolicyform.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
diff --git a/cmd/postpolicyform_test.go b/legacy/postpolicyform_test.go
similarity index 99%
rename from cmd/postpolicyform_test.go
rename to legacy/postpolicyform_test.go
index be39b63..d381222 100644
--- a/cmd/postpolicyform_test.go
+++ b/legacy/postpolicyform_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/base64"
diff --git a/cmd/prepare-storage.go b/legacy/prepare-storage.go
similarity index 98%
rename from cmd/prepare-storage.go
rename to legacy/prepare-storage.go
index 9c813c9..69214c6 100644
--- a/cmd/prepare-storage.go
+++ b/legacy/prepare-storage.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/tls"
@@ -27,10 +27,10 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
 
diff --git a/cmd/rest/client.go b/legacy/rest/client.go
similarity index 99%
rename from cmd/rest/client.go
rename to legacy/rest/client.go
index f8a1d0b..ce7b155 100644
--- a/cmd/rest/client.go
+++ b/legacy/rest/client.go
@@ -26,7 +26,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // DefaultRESTTimeout - default RPC timeout is one minute.
diff --git a/cmd/routers.go b/legacy/routers.go
similarity index 99%
rename from cmd/routers.go
rename to legacy/routers.go
index e78e726..64b01e4 100644
--- a/cmd/routers.go
+++ b/legacy/routers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/server-main.go b/legacy/server-main.go
similarity index 99%
rename from cmd/server-main.go
rename to legacy/server-main.go
index b982f1b..8bfff83 100644
--- a/cmd/server-main.go
+++ b/legacy/server-main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -31,9 +31,9 @@ import (
 	"time"
 
 	"github.com/minio/cli"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/certs"
 	"github.com/minio/minio/pkg/color"
diff --git a/cmd/server-main_test.go b/legacy/server-main_test.go
similarity index 99%
rename from cmd/server-main_test.go
rename to legacy/server-main_test.go
index e05bbdc..4495a9c 100644
--- a/cmd/server-main_test.go
+++ b/legacy/server-main_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/server-rlimit.go b/legacy/server-rlimit.go
similarity index 99%
rename from cmd/server-rlimit.go
rename to legacy/server-rlimit.go
index 7002d40..38f0698 100644
--- a/cmd/server-rlimit.go
+++ b/legacy/server-rlimit.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"runtime/debug"
diff --git a/cmd/server-startup-msg.go b/legacy/server-startup-msg.go
similarity index 99%
rename from cmd/server-startup-msg.go
rename to legacy/server-startup-msg.go
index d004dad..52bd598 100644
--- a/cmd/server-startup-msg.go
+++ b/legacy/server-startup-msg.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/x509"
@@ -24,8 +24,8 @@ import (
 	"strings"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	color "github.com/minio/minio/pkg/color"
 	xnet "github.com/minio/minio/pkg/net"
 )
diff --git a/cmd/server-startup-msg_test.go b/legacy/server-startup-msg_test.go
similarity index 99%
rename from cmd/server-startup-msg_test.go
rename to legacy/server-startup-msg_test.go
index d0eb14f..7c90556 100644
--- a/cmd/server-startup-msg_test.go
+++ b/legacy/server-startup-msg_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/server_test.go b/legacy/server_test.go
similarity index 99%
rename from cmd/server_test.go
rename to legacy/server_test.go
index df59bf6..024e332 100644
--- a/cmd/server_test.go
+++ b/legacy/server_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -32,7 +32,7 @@ import (
 	"time"
 
 	humanize "github.com/dustin/go-humanize"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/service.go b/legacy/service.go
similarity index 99%
rename from cmd/service.go
rename to legacy/service.go
index 8f10eae..9d00f9a 100644
--- a/cmd/service.go
+++ b/legacy/service.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/setup-type.go b/legacy/setup-type.go
similarity index 98%
rename from cmd/setup-type.go
rename to legacy/setup-type.go
index 516e582..d32d2a5 100644
--- a/cmd/setup-type.go
+++ b/legacy/setup-type.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // SetupType - enum for setup type.
 type SetupType int
diff --git a/cmd/signals.go b/legacy/signals.go
similarity index 97%
rename from cmd/signals.go
rename to legacy/signals.go
index 965a85c..e3f4502 100644
--- a/cmd/signals.go
+++ b/legacy/signals.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"os"
 	"strings"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 func handleSignals() {
diff --git a/cmd/signature-v2.go b/legacy/signature-v2.go
similarity index 99%
rename from cmd/signature-v2.go
rename to legacy/signature-v2.go
index 630c415..87ef029 100644
--- a/cmd/signature-v2.go
+++ b/legacy/signature-v2.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/hmac"
@@ -28,7 +28,7 @@ import (
 	"strconv"
 	"strings"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 
 	"github.com/minio/minio/pkg/auth"
 )
diff --git a/cmd/signature-v2_test.go b/legacy/signature-v2_test.go
similarity index 99%
rename from cmd/signature-v2_test.go
rename to legacy/signature-v2_test.go
index 1393070..9336356 100644
--- a/cmd/signature-v2_test.go
+++ b/legacy/signature-v2_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/signature-v4-parser.go b/legacy/signature-v4-parser.go
similarity index 99%
rename from cmd/signature-v4-parser.go
rename to legacy/signature-v4-parser.go
index 31006f1..7256b62 100644
--- a/cmd/signature-v4-parser.go
+++ b/legacy/signature-v4-parser.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/signature-v4-parser_test.go b/legacy/signature-v4-parser_test.go
similarity index 99%
rename from cmd/signature-v4-parser_test.go
rename to legacy/signature-v4-parser_test.go
index 13b1ee7..45c3bfe 100644
--- a/cmd/signature-v4-parser_test.go
+++ b/legacy/signature-v4-parser_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/url"
diff --git a/cmd/signature-v4-utils.go b/legacy/signature-v4-utils.go
similarity index 98%
rename from cmd/signature-v4-utils.go
rename to legacy/signature-v4-utils.go
index 6f09d68..d6a6001 100644
--- a/cmd/signature-v4-utils.go
+++ b/legacy/signature-v4-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,8 +26,8 @@ import (
 	"strconv"
 	"strings"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/sha256-simd"
 )
diff --git a/cmd/signature-v4-utils_test.go b/legacy/signature-v4-utils_test.go
similarity index 99%
rename from cmd/signature-v4-utils_test.go
rename to legacy/signature-v4-utils_test.go
index 399cf50..80bb047 100644
--- a/cmd/signature-v4-utils_test.go
+++ b/legacy/signature-v4-utils_test.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"testing"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 )
 
 // TestSkipContentSha256Cksum - Test validate the logic which decides whether
diff --git a/cmd/signature-v4.go b/legacy/signature-v4.go
similarity index 99%
rename from cmd/signature-v4.go
rename to legacy/signature-v4.go
index 9f13528..6407c2c 100644
--- a/cmd/signature-v4.go
+++ b/legacy/signature-v4.go
@@ -22,7 +22,7 @@
 // - Based on Authorization header.
 // - Based on Query parameters.
 // - Based on Form POST policy.
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -36,7 +36,7 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	sha256 "github.com/minio/sha256-simd"
 )
 
diff --git a/cmd/signature-v4_test.go b/legacy/signature-v4_test.go
similarity index 99%
rename from cmd/signature-v4_test.go
rename to legacy/signature-v4_test.go
index f9fd3e1..004d2de 100644
--- a/cmd/signature-v4_test.go
+++ b/legacy/signature-v4_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/storage-datatypes.go b/legacy/storage-datatypes.go
similarity index 97%
rename from cmd/storage-datatypes.go
rename to legacy/storage-datatypes.go
index 12f3ed1..24be38b 100644
--- a/cmd/storage-datatypes.go
+++ b/legacy/storage-datatypes.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // VolInfo - represents volume stat information.
diff --git a/cmd/storage-errors.go b/legacy/storage-errors.go
similarity index 99%
rename from cmd/storage-errors.go
rename to legacy/storage-errors.go
index 6a674e1..f904a0c 100644
--- a/cmd/storage-errors.go
+++ b/legacy/storage-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // errUnexpected - unexpected error, requires manual intervention.
 var errUnexpected = StorageErr("Unexpected error, please report this issue at https://github.com/minio/minio/issues")
diff --git a/cmd/storage-interface.go b/legacy/storage-interface.go
similarity index 99%
rename from cmd/storage-interface.go
rename to legacy/storage-interface.go
index 7cfe37f..7096265 100644
--- a/cmd/storage-interface.go
+++ b/legacy/storage-interface.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/storage-rest-client.go b/legacy/storage-rest-client.go
similarity index 98%
rename from cmd/storage-rest-client.go
rename to legacy/storage-rest-client.go
index 38c3f06..0e9fd76 100644
--- a/cmd/storage-rest-client.go
+++ b/legacy/storage-rest-client.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -31,10 +31,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/http"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	"github.com/minio/minio/legacy/http"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 	xnet "github.com/minio/minio/pkg/net"
 )
 
diff --git a/cmd/storage-rest-common.go b/legacy/storage-rest-common.go
similarity index 99%
rename from cmd/storage-rest-common.go
rename to legacy/storage-rest-common.go
index a52c63e..dbf6fd4 100644
--- a/cmd/storage-rest-common.go
+++ b/legacy/storage-rest-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 const (
 	storageRESTVersion       = "v17" // RemoveBucket API change
diff --git a/cmd/storage-rest-server.go b/legacy/storage-rest-server.go
similarity index 99%
rename from cmd/storage-rest-server.go
rename to legacy/storage-rest-server.go
index d105e31..5ebeecb 100644
--- a/cmd/storage-rest-server.go
+++ b/legacy/storage-rest-server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -33,10 +33,10 @@ import (
 
 	jwtreq "github.com/dgrijalva/jwt-go/request"
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	xjwt "github.com/minio/minio/cmd/jwt"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	xjwt "github.com/minio/minio/legacy/jwt"
+	"github.com/minio/minio/legacy/logger"
 )
 
 var errDiskStale = errors.New("disk stale")
diff --git a/cmd/storage-rest_test.go b/legacy/storage-rest_test.go
similarity index 99%
rename from cmd/storage-rest_test.go
rename to legacy/storage-rest_test.go
index 525e50a..995f6f5 100644
--- a/cmd/storage-rest_test.go
+++ b/legacy/storage-rest_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io/ioutil"
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	xnet "github.com/minio/minio/pkg/net"
 )
 
diff --git a/cmd/streaming-signature-v4.go b/legacy/streaming-signature-v4.go
similarity index 99%
rename from cmd/streaming-signature-v4.go
rename to legacy/streaming-signature-v4.go
index 0de2115..f2749c0 100644
--- a/cmd/streaming-signature-v4.go
+++ b/legacy/streaming-signature-v4.go
@@ -16,7 +16,7 @@
 
 // Package cmd This file implements helper functions to validate Streaming AWS
 // Signature Version '4' authorization header.
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	humanize "github.com/dustin/go-humanize"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/auth"
 	sha256 "github.com/minio/sha256-simd"
 )
diff --git a/cmd/streaming-signature-v4_test.go b/legacy/streaming-signature-v4_test.go
similarity index 99%
rename from cmd/streaming-signature-v4_test.go
rename to legacy/streaming-signature-v4_test.go
index e3474b2..ae37f40 100644
--- a/cmd/streaming-signature-v4_test.go
+++ b/legacy/streaming-signature-v4_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
diff --git a/cmd/sts-datatypes.go b/legacy/sts-datatypes.go
similarity index 99%
rename from cmd/sts-datatypes.go
rename to legacy/sts-datatypes.go
index 18f440d..53d73b1 100644
--- a/cmd/sts-datatypes.go
+++ b/legacy/sts-datatypes.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
diff --git a/cmd/sts-errors.go b/legacy/sts-errors.go
similarity index 98%
rename from cmd/sts-errors.go
rename to legacy/sts-errors.go
index 7f10af1..38dd46a 100644
--- a/cmd/sts-errors.go
+++ b/legacy/sts-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"net/http"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // writeSTSErrorRespone writes error headers
diff --git a/cmd/sts-handlers.go b/legacy/sts-handlers.go
similarity index 99%
rename from cmd/sts-handlers.go
rename to legacy/sts-handlers.go
index fdc3806..628fbf3 100644
--- a/cmd/sts-handlers.go
+++ b/legacy/sts-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,9 +25,9 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/wildcard"
diff --git a/cmd/test-utils_test.go b/legacy/test-utils_test.go
similarity index 99%
rename from cmd/test-utils_test.go
rename to legacy/test-utils_test.go
index 348ad3e..29c51f4 100644
--- a/cmd/test-utils_test.go
+++ b/legacy/test-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -56,9 +56,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
 	"github.com/minio/minio-go/v6/pkg/signer"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/hash"
diff --git a/cmd/tree-walk-pool.go b/legacy/tree-walk-pool.go
similarity index 99%
rename from cmd/tree-walk-pool.go
rename to legacy/tree-walk-pool.go
index 54e5683..2310471 100644
--- a/cmd/tree-walk-pool.go
+++ b/legacy/tree-walk-pool.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/tree-walk-pool_test.go b/legacy/tree-walk-pool_test.go
similarity index 99%
rename from cmd/tree-walk-pool_test.go
rename to legacy/tree-walk-pool_test.go
index 313383d..22d5535 100644
--- a/cmd/tree-walk-pool_test.go
+++ b/legacy/tree-walk-pool_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/tree-walk.go b/legacy/tree-walk.go
similarity index 99%
rename from cmd/tree-walk.go
rename to legacy/tree-walk.go
index ff76a38..71a76f4 100644
--- a/cmd/tree-walk.go
+++ b/legacy/tree-walk.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/tree-walk_test.go b/legacy/tree-walk_test.go
similarity index 99%
rename from cmd/tree-walk_test.go
rename to legacy/tree-walk_test.go
index 0ea5e02..68a1584 100644
--- a/cmd/tree-walk_test.go
+++ b/legacy/tree-walk_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/typed-errors.go b/legacy/typed-errors.go
similarity index 99%
rename from cmd/typed-errors.go
rename to legacy/typed-errors.go
index 2731547..a54ed9e 100644
--- a/cmd/typed-errors.go
+++ b/legacy/typed-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/update-notifier.go b/legacy/update-notifier.go
similarity index 99%
rename from cmd/update-notifier.go
rename to legacy/update-notifier.go
index f80c7d5..614db51 100644
--- a/cmd/update-notifier.go
+++ b/legacy/update-notifier.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/update-notifier_test.go b/legacy/update-notifier_test.go
similarity index 99%
rename from cmd/update-notifier_test.go
rename to legacy/update-notifier_test.go
index b175ede..5dd5710 100644
--- a/cmd/update-notifier_test.go
+++ b/legacy/update-notifier_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/update.go b/legacy/update.go
similarity index 99%
rename from cmd/update.go
rename to legacy/update.go
index dcf20c1..a04037a 100644
--- a/cmd/update.go
+++ b/legacy/update.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -32,8 +32,8 @@ import (
 	"time"
 
 	"github.com/inconshreveable/go-update"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 	_ "github.com/minio/sha256-simd" // Needed for sha256 hash verifier.
diff --git a/cmd/update_test.go b/legacy/update_test.go
similarity index 99%
rename from cmd/update_test.go
rename to legacy/update_test.go
index 5a4b73a..5bf0d46 100644
--- a/cmd/update_test.go
+++ b/legacy/update_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/utils.go b/legacy/utils.go
similarity index 99%
rename from cmd/utils.go
rename to legacy/utils.go
index 1b28ba9..20d4078 100644
--- a/cmd/utils.go
+++ b/legacy/utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -39,8 +39,8 @@ import (
 	"sync"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 	"github.com/minio/minio/pkg/madmin"
 
diff --git a/cmd/utils_test.go b/legacy/utils_test.go
similarity index 99%
rename from cmd/utils_test.go
rename to legacy/utils_test.go
index 39ed623..bebbd90 100644
--- a/cmd/utils_test.go
+++ b/legacy/utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/version_test.go b/legacy/version_test.go
similarity index 98%
rename from cmd/version_test.go
rename to legacy/version_test.go
index d76977c..f6baa25 100644
--- a/cmd/version_test.go
+++ b/legacy/version_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/web-handler-context.go b/legacy/web-handler-context.go
similarity index 99%
rename from cmd/web-handler-context.go
rename to legacy/web-handler-context.go
index be18b24..46a4aff 100644
--- a/cmd/web-handler-context.go
+++ b/legacy/web-handler-context.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 )
 
diff --git a/cmd/web-handler-context_test.go b/legacy/web-handler-context_test.go
similarity index 97%
rename from cmd/web-handler-context_test.go
rename to legacy/web-handler-context_test.go
index 807f96d..4ddcd00 100644
--- a/cmd/web-handler-context_test.go
+++ b/legacy/web-handler-context_test.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
 	"net/http"
 	"testing"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 func TestKeyValueMap(t *testing.T) {
diff --git a/cmd/web-handlers.go b/legacy/web-handlers.go
similarity index 99%
rename from cmd/web-handlers.go
rename to legacy/web-handlers.go
index ab768ee..0cb9d26 100644
--- a/cmd/web-handlers.go
+++ b/legacy/web-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -37,11 +37,11 @@ import (
 	"github.com/klauspost/compress/zip"
 	miniogopolicy "github.com/minio/minio-go/v6/pkg/policy"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
diff --git a/cmd/web-handlers_test.go b/legacy/web-handlers_test.go
similarity index 99%
rename from cmd/web-handlers_test.go
rename to legacy/web-handlers_test.go
index 6764101..f3be883 100644
--- a/cmd/web-handlers_test.go
+++ b/legacy/web-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"archive/zip"
@@ -35,7 +35,7 @@ import (
 
 	jwtgo "github.com/dgrijalva/jwt-go"
 	humanize "github.com/dustin/go-humanize"
-	xjwt "github.com/minio/minio/cmd/jwt"
+	xjwt "github.com/minio/minio/legacy/jwt"
 	"github.com/minio/minio/pkg/hash"
 )
 
diff --git a/cmd/web-router.go b/legacy/web-router.go
similarity index 99%
rename from cmd/web-router.go
rename to legacy/web-router.go
index 02bd822..cdf86c2 100644
--- a/cmd/web-router.go
+++ b/legacy/web-router.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/xl-sets.go b/legacy/xl-sets.go
similarity index 99%
rename from cmd/xl-sets.go
rename to legacy/xl-sets.go
index 0bef6fb..47d10b0 100644
--- a/cmd/xl-sets.go
+++ b/legacy/xl-sets.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -28,9 +28,9 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/storageclass"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/storageclass"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bpool"
 	"github.com/minio/minio/pkg/dsync"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/xl-sets_test.go b/legacy/xl-sets_test.go
similarity index 99%
rename from cmd/xl-sets_test.go
rename to legacy/xl-sets_test.go
index 91d2f95..c708f6e 100644
--- a/cmd/xl-sets_test.go
+++ b/legacy/xl-sets_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/xl-v1-bucket.go b/legacy/xl-v1-bucket.go
similarity index 99%
rename from cmd/xl-v1-bucket.go
rename to legacy/xl-v1-bucket.go
index 5c1cf6a..193764b 100644
--- a/cmd/xl-v1-bucket.go
+++ b/legacy/xl-v1-bucket.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"sort"
 
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/cmd/xl-v1-common.go b/legacy/xl-v1-common.go
similarity index 99%
rename from cmd/xl-v1-common.go
rename to legacy/xl-v1-common.go
index be826de..39ef693 100644
--- a/cmd/xl-v1-common.go
+++ b/legacy/xl-v1-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/xl-v1-common_test.go b/legacy/xl-v1-common_test.go
similarity index 99%
rename from cmd/xl-v1-common_test.go
rename to legacy/xl-v1-common_test.go
index 876ecb7..9af8b12 100644
--- a/cmd/xl-v1-common_test.go
+++ b/legacy/xl-v1-common_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/xl-v1-errors.go b/legacy/xl-v1-errors.go
similarity index 98%
rename from cmd/xl-v1-errors.go
rename to legacy/xl-v1-errors.go
index 3dc0260..5b3768f 100644
--- a/cmd/xl-v1-errors.go
+++ b/legacy/xl-v1-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "errors"
 
diff --git a/cmd/xl-v1-healing-common.go b/legacy/xl-v1-healing-common.go
similarity index 99%
rename from cmd/xl-v1-healing-common.go
rename to legacy/xl-v1-healing-common.go
index f7daef0..90310fb 100644
--- a/cmd/xl-v1-healing-common.go
+++ b/legacy/xl-v1-healing-common.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"fmt"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/xl-v1-healing-common_test.go b/legacy/xl-v1-healing-common_test.go
similarity index 99%
rename from cmd/xl-v1-healing-common_test.go
rename to legacy/xl-v1-healing-common_test.go
index 7d2df85..95f85b8 100644
--- a/cmd/xl-v1-healing-common_test.go
+++ b/legacy/xl-v1-healing-common_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/xl-v1-healing.go b/legacy/xl-v1-healing.go
similarity index 99%
rename from cmd/xl-v1-healing.go
rename to legacy/xl-v1-healing.go
index 20d9c57..811701c 100644
--- a/cmd/xl-v1-healing.go
+++ b/legacy/xl-v1-healing.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/cmd/xl-v1-healing_test.go b/legacy/xl-v1-healing_test.go
similarity index 99%
rename from cmd/xl-v1-healing_test.go
rename to legacy/xl-v1-healing_test.go
index 3afd9ed..9cb12dc 100644
--- a/cmd/xl-v1-healing_test.go
+++ b/legacy/xl-v1-healing_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/xl-v1-list-objects-heal.go b/legacy/xl-v1-list-objects-heal.go
similarity index 96%
rename from cmd/xl-v1-list-objects-heal.go
rename to legacy/xl-v1-list-objects-heal.go
index 4974b77..3d0d735 100644
--- a/cmd/xl-v1-list-objects-heal.go
+++ b/legacy/xl-v1-list-objects-heal.go
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/xl-v1-list-objects.go b/legacy/xl-v1-list-objects.go
similarity index 98%
rename from cmd/xl-v1-list-objects.go
rename to legacy/xl-v1-list-objects.go
index 16e2672..3315893 100644
--- a/cmd/xl-v1-list-objects.go
+++ b/legacy/xl-v1-list-objects.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/xl-v1-metadata.go b/legacy/xl-v1-metadata.go
similarity index 99%
rename from cmd/xl-v1-metadata.go
rename to legacy/xl-v1-metadata.go
index 4941d26..6b38230 100644
--- a/cmd/xl-v1-metadata.go
+++ b/legacy/xl-v1-metadata.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -28,8 +28,8 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/sync/errgroup"
 	"github.com/minio/sha256-simd"
 )
diff --git a/cmd/xl-v1-metadata_test.go b/legacy/xl-v1-metadata_test.go
similarity index 99%
rename from cmd/xl-v1-metadata_test.go
rename to legacy/xl-v1-metadata_test.go
index fad2cd3..a11781f 100644
--- a/cmd/xl-v1-metadata_test.go
+++ b/legacy/xl-v1-metadata_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/xl-v1-multipart.go b/legacy/xl-v1-multipart.go
similarity index 99%
rename from cmd/xl-v1-multipart.go
rename to legacy/xl-v1-multipart.go
index 821220b..b555931 100644
--- a/cmd/xl-v1-multipart.go
+++ b/legacy/xl-v1-multipart.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/mimedb"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/cmd/xl-v1-multipart_test.go b/legacy/xl-v1-multipart_test.go
similarity index 99%
rename from cmd/xl-v1-multipart_test.go
rename to legacy/xl-v1-multipart_test.go
index f2f14ed..b0a368b 100644
--- a/cmd/xl-v1-multipart_test.go
+++ b/legacy/xl-v1-multipart_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/xl-v1-object.go b/legacy/xl-v1-object.go
similarity index 99%
rename from cmd/xl-v1-object.go
rename to legacy/xl-v1-object.go
index 6cc0b71..2b5e490 100644
--- a/cmd/xl-v1-object.go
+++ b/legacy/xl-v1-object.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,8 +26,8 @@ import (
 	"sync"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/mimedb"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/cmd/xl-v1-object_test.go b/legacy/xl-v1-object_test.go
similarity index 99%
rename from cmd/xl-v1-object_test.go
rename to legacy/xl-v1-object_test.go
index 1e7dfac..626259f 100644
--- a/cmd/xl-v1-object_test.go
+++ b/legacy/xl-v1-object_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config/storageclass"
+	"github.com/minio/minio/legacy/config/storageclass"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/xl-v1-utils.go b/legacy/xl-v1-utils.go
similarity index 99%
rename from cmd/xl-v1-utils.go
rename to legacy/xl-v1-utils.go
index c77b2ed..1fffb81 100644
--- a/cmd/xl-v1-utils.go
+++ b/legacy/xl-v1-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"path"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
 
diff --git a/cmd/xl-v1-utils_test.go b/legacy/xl-v1-utils_test.go
similarity index 99%
rename from cmd/xl-v1-utils_test.go
rename to legacy/xl-v1-utils_test.go
index 7ab5e0c..8197d2b 100644
--- a/cmd/xl-v1-utils_test.go
+++ b/legacy/xl-v1-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/xl-v1.go b/legacy/xl-v1.go
similarity index 99%
rename from cmd/xl-v1.go
rename to legacy/xl-v1.go
index 29c7008..7bbdbb2 100644
--- a/cmd/xl-v1.go
+++ b/legacy/xl-v1.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bpool"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/dsync"
diff --git a/cmd/xl-zones.go b/legacy/xl-zones.go
similarity index 99%
rename from cmd/xl-zones.go
rename to legacy/xl-zones.go
index 4c45d46..8f95565 100644
--- a/cmd/xl-zones.go
+++ b/legacy/xl-zones.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -27,9 +27,9 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/storageclass"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/storageclass"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/neofs/layer/gateway-neofs.go b/neofs/layer/gateway-neofs.go
index ee58534..aaebe80 100644
--- a/neofs/layer/gateway-neofs.go
+++ b/neofs/layer/gateway-neofs.go
@@ -6,7 +6,7 @@ import (
 	"math"
 	"time"
 
-	minio "github.com/minio/minio/cmd"
+	minio "github.com/minio/minio/legacy"
 	"github.com/minio/minio/neofs/pool"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/nspcc-dev/neofs-api-go/chain"
diff --git a/neofs/layer/object-layer.go b/neofs/layer/object-layer.go
index b6ad725..7ccbef9 100644
--- a/neofs/layer/object-layer.go
+++ b/neofs/layer/object-layer.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"strings"
 
-	minio "github.com/minio/minio/cmd"
+	minio "github.com/minio/minio/legacy"
 	"github.com/minio/minio/pkg/hash"
 	"github.com/nspcc-dev/neofs-api-go/object"
 	"github.com/nspcc-dev/neofs-api-go/refs"
diff --git a/neofs/layer/util.go b/neofs/layer/util.go
index 59411b7..880fd81 100644
--- a/neofs/layer/util.go
+++ b/neofs/layer/util.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	minio "github.com/minio/minio/cmd"
+	minio "github.com/minio/minio/legacy"
 	"github.com/minio/minio/neofs/pool"
 	"github.com/nspcc-dev/neofs-api-go/object"
 	"github.com/nspcc-dev/neofs-api-go/refs"
diff --git a/pkg/bucket/object/lock/lock.go b/pkg/bucket/object/lock/lock.go
index 3acc85a..df8cbca 100644
--- a/pkg/bucket/object/lock/lock.go
+++ b/pkg/bucket/object/lock/lock.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/beevik/ntp"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/pkg/bucket/object/lock/lock_test.go b/pkg/bucket/object/lock/lock_test.go
index 6e50364..9edd7f6 100644
--- a/pkg/bucket/object/lock/lock_test.go
+++ b/pkg/bucket/object/lock/lock_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 func TestParseMode(t *testing.T) {