Index: trunk/src/org/openstreetmap/josm/CLIModule.java
===================================================================
--- trunk/src/org/openstreetmap/josm/CLIModule.java	(revision 14117)
+++ 	(revision )
@@ -1,27 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm;
-
-/**
- * A command line interface module.
- * <p>
- * The user can provide an action keyword as first argument. This will invoke the
- * corresponding {@code CLIModule}, which has its own set of options and will do
- * a specific job.
- * @since 12793
- */
-public interface CLIModule {
-
-    /**
-     * Get the action keyword that the user needs to provide as first command
-     * line argument to invoke this module.
-     * @return the action keyword of this module
-     */
-    String getActionKeyword();
-
-    /**
-     * Process the remaining command line arguments and run any of the requested actions.
-     * @param argArray command line arguments without the initial action keyword
-     */
-    void processArguments(String[] argArray);
-
-}
Index: trunk/src/org/openstreetmap/josm/cli/CLIModule.java
===================================================================
--- trunk/src/org/openstreetmap/josm/cli/CLIModule.java	(revision 14118)
+++ trunk/src/org/openstreetmap/josm/cli/CLIModule.java	(revision 14118)
@@ -0,0 +1,26 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.cli;
+
+/**
+ * A command line interface module.
+ * <p>
+ * The user can provide an action keyword as first argument. This will invoke the
+ * corresponding {@code CLIModule}, which has its own set of options and will do
+ * a specific job.
+ * @since 12793
+ */
+public interface CLIModule {
+
+    /**
+     * Get the action keyword that the user needs to provide as first command
+     * line argument to invoke this module.
+     * @return the action keyword of this module
+     */
+    String getActionKeyword();
+
+    /**
+     * Process the remaining command line arguments and run any of the requested actions.
+     * @param argArray command line arguments without the initial action keyword
+     */
+    void processArguments(String[] argArray);
+}
Index: trunk/src/org/openstreetmap/josm/cli/package-info.java
===================================================================
--- trunk/src/org/openstreetmap/josm/cli/package-info.java	(revision 14118)
+++ trunk/src/org/openstreetmap/josm/cli/package-info.java	(revision 14118)
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM command line interface.
+ */
+package org.openstreetmap.josm.cli;
Index: trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java	(revision 14117)
+++ trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java	(revision 14118)
@@ -15,5 +15,5 @@
 import java.util.function.Function;
 
-import org.openstreetmap.josm.CLIModule;
+import org.openstreetmap.josm.cli.CLIModule;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 14117)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 14118)
@@ -70,5 +70,4 @@
 import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
 import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
-import org.openstreetmap.josm.CLIModule;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.DeleteAction;
@@ -85,4 +84,5 @@
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
+import org.openstreetmap.josm.cli.CLIModule;
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SplitWayCommand;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java	(revision 14117)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java	(revision 14118)
@@ -21,6 +21,6 @@
 
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
-import org.openstreetmap.josm.CLIModule;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.cli.CLIModule;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;