diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
index 0bed19023c..1f4b921d94 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
@@ -43,6 +43,8 @@ import org.kohsuke.args4j.Option;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import sonia.scm.cli.cmd.SubCommand;
+import sonia.scm.cli.cmd.SubCommandOptionHandler;
 import sonia.scm.cli.config.ConfigOptionHandler;
 import sonia.scm.cli.config.ScmClientConfig;
 import sonia.scm.cli.config.ServerConfig;
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/Command.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/Command.java
similarity index 98%
rename from scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/Command.java
rename to scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/Command.java
index 19b9a39fc5..033e61b192 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/Command.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/Command.java
@@ -31,7 +31,7 @@
 
 
 
-package sonia.scm.cli;
+package sonia.scm.cli.cmd;
 
 //~--- JDK imports ------------------------------------------------------------
 
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/CommandDescriptor.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CommandDescriptor.java
similarity index 99%
rename from scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/CommandDescriptor.java
rename to scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CommandDescriptor.java
index 8c9630a1d4..c4763b9f83 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/CommandDescriptor.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CommandDescriptor.java
@@ -31,7 +31,7 @@
 
 
 
-package sonia.scm.cli;
+package sonia.scm.cli.cmd;
 
 //~--- non-JDK imports --------------------------------------------------------
 
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java
similarity index 98%
rename from scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java
rename to scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java
index 2c395825d5..74818c26b0 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java
@@ -31,7 +31,7 @@
 
 
 
-package sonia.scm.cli;
+package sonia.scm.cli.cmd;
 
 //~--- non-JDK imports --------------------------------------------------------
 
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java
similarity index 98%
rename from scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java
rename to scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java
index 639796cde4..0026a0e209 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java
@@ -31,7 +31,7 @@
 
 
 
-package sonia.scm.cli;
+package sonia.scm.cli.cmd;
 
 //~--- non-JDK imports --------------------------------------------------------
 
@@ -42,6 +42,7 @@ import org.kohsuke.args4j.Option;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import sonia.scm.cli.I18n;
 import sonia.scm.cli.config.ServerConfig;
 import sonia.scm.client.ScmClient;
 import sonia.scm.client.ScmClientSession;
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandOptionHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
similarity index 99%
rename from scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandOptionHandler.java
rename to scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
index 0cb3e653b0..8942654ffd 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandOptionHandler.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
@@ -31,7 +31,7 @@
 
 
 
-package sonia.scm.cli;
+package sonia.scm.cli.cmd;
 
 //~--- non-JDK imports --------------------------------------------------------