diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java
index 0fe2b2f2cf8..3dc02f0f2bf 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java
@@ -61,7 +61,7 @@
 
 @Command(
     name = "generate-blockchain-config",
-    description = "Generates node keypairs and genesis file with RLP encoded extra data.",
+    description = "Generate node keypairs and genesis file with RLP encoded extra data.",
     mixinStandardHelpOptions = true,
     versionProvider = VersionProvider.class)
 class GenerateBlockchainConfig implements Runnable {
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommandTest.java
similarity index 98%
rename from besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java
rename to besu/src/test/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommandTest.java
index ac1ec2e5777..7e9a36719d7 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommandTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.cli.operator;
+package org.hyperledger.besu.cli.subcommands.operator;
 
 import static java.lang.String.format;
 import static java.lang.System.currentTimeMillis;
@@ -22,11 +22,10 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.contentOf;
-import static org.hyperledger.besu.cli.operator.OperatorSubCommandTest.Cmd.cmd;
+import static org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommandTest.Cmd.cmd;
 
 import org.hyperledger.besu.BesuInfo;
 import org.hyperledger.besu.cli.CommandTestAbstract;
-import org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommand;
 import org.hyperledger.besu.crypto.SECP256K1;
 import org.hyperledger.besu.crypto.SECP256R1;
 import org.hyperledger.besu.crypto.SECPPrivateKey;
@@ -72,7 +71,7 @@ public class OperatorSubCommandTest extends CommandTestAbstract {
           + System.lineSeparator()
           + "Commands:"
           + System.lineSeparator()
-          + "  generate-blockchain-config  Generates node keypairs and genesis file with RLP"
+          + "  generate-blockchain-config  Generate node keypairs and genesis file with RLP"
           + System.lineSeparator()
           + "                                encoded extra data."
           + System.lineSeparator()
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommandTest.java
similarity index 99%
rename from besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java
rename to besu/src/test/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommandTest.java
index 3eca54df252..8c9b9aad932 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommandTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.cli.rlp;
+package org.hyperledger.besu.cli.subcommands.rlp;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;