diff --git a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDMoveAction.java b/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDMoveAction.java
index 0fa992f..365c4ee 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDMoveAction.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDMoveAction.java
@@ -16,6 +16,7 @@ import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.rapid.RapiDPlugin;
+import org.openstreetmap.josm.plugins.rapid.commands.RapiDAddCommand;
 import org.openstreetmap.josm.tools.Shortcut;
 
 public class RapiDMoveAction extends JosmAction {
diff --git a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/AddNodeToWayCommand.java b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/AddNodeToWayCommand.java
similarity index 96%
rename from src/main/java/org/openstreetmap/josm/plugins/rapid/backend/AddNodeToWayCommand.java
rename to src/main/java/org/openstreetmap/josm/plugins/rapid/commands/AddNodeToWayCommand.java
index 8491f20..4b12dc9 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/AddNodeToWayCommand.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/AddNodeToWayCommand.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
diff --git a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/AddPrimitivesCommand.java b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/AddPrimitivesCommand.java
similarity index 98%
rename from src/main/java/org/openstreetmap/josm/plugins/rapid/backend/AddPrimitivesCommand.java
rename to src/main/java/org/openstreetmap/josm/plugins/rapid/commands/AddPrimitivesCommand.java
index bba87e9..80e07d8 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/AddPrimitivesCommand.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/AddPrimitivesCommand.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
diff --git a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/CreateConnectionsCommand.java b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/CreateConnectionsCommand.java
similarity index 99%
rename from src/main/java/org/openstreetmap/josm/plugins/rapid/backend/CreateConnectionsCommand.java
rename to src/main/java/org/openstreetmap/josm/plugins/rapid/commands/CreateConnectionsCommand.java
index 571df3b..45022c0 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/CreateConnectionsCommand.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/CreateConnectionsCommand.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
diff --git a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/DeletePrimitivesCommand.java b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/DeletePrimitivesCommand.java
similarity index 98%
rename from src/main/java/org/openstreetmap/josm/plugins/rapid/backend/DeletePrimitivesCommand.java
rename to src/main/java/org/openstreetmap/josm/plugins/rapid/commands/DeletePrimitivesCommand.java
index 131c47f..9b54067 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/DeletePrimitivesCommand.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/DeletePrimitivesCommand.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
diff --git a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/MovePrimitiveDataSetCommand.java b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/MovePrimitiveDataSetCommand.java
similarity index 95%
rename from src/main/java/org/openstreetmap/josm/plugins/rapid/backend/MovePrimitiveDataSetCommand.java
rename to src/main/java/org/openstreetmap/josm/plugins/rapid/commands/MovePrimitiveDataSetCommand.java
index 78ac73c..320577d 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/MovePrimitiveDataSetCommand.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/MovePrimitiveDataSetCommand.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -13,6 +13,7 @@ import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.rapid.RapiDPlugin;
+import org.openstreetmap.josm.plugins.rapid.backend.RapiDDataUtils;
 import org.openstreetmap.josm.tools.Logging;
 
 /**
diff --git a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDAddCommand.java b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/RapiDAddCommand.java
similarity index 95%
rename from src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDAddCommand.java
rename to src/main/java/org/openstreetmap/josm/plugins/rapid/commands/RapiDAddCommand.java
index 82b29d2..e3789c5 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDAddCommand.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/rapid/commands/RapiDAddCommand.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -12,6 +12,8 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.rapid.RapiDPlugin;
+import org.openstreetmap.josm.plugins.rapid.backend.RapiDDataUtils;
+import org.openstreetmap.josm.plugins.rapid.backend.RapiDLayer;
 import org.openstreetmap.josm.tools.Logging;
 
 public class RapiDAddCommand extends Command {
diff --git a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/AddNodeToWayCommandTest.java b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/AddNodeToWayCommandTest.java
similarity index 94%
rename from test/unit/org/openstreetmap/josm/plugins/rapid/backend/AddNodeToWayCommandTest.java
rename to test/unit/org/openstreetmap/josm/plugins/rapid/commands/AddNodeToWayCommandTest.java
index 582a927..38b2a51 100644
--- a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/AddNodeToWayCommandTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/AddNodeToWayCommandTest.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,6 +14,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.rapid.commands.AddNodeToWayCommand;
 import org.openstreetmap.josm.testutils.JOSMTestRules;;
 
 public class AddNodeToWayCommandTest {
diff --git a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/AddPrimitivesCommandTest.java b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/AddPrimitivesCommandTest.java
similarity index 95%
rename from test/unit/org/openstreetmap/josm/plugins/rapid/backend/AddPrimitivesCommandTest.java
rename to test/unit/org/openstreetmap/josm/plugins/rapid/commands/AddPrimitivesCommandTest.java
index 8ec1b0c..6e4c1ce 100644
--- a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/AddPrimitivesCommandTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/AddPrimitivesCommandTest.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -13,6 +13,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.rapid.commands.AddPrimitivesCommand;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 public class AddPrimitivesCommandTest {
diff --git a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/DeletePrimitivesCommandTest.java b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/DeletePrimitivesCommandTest.java
similarity index 94%
rename from test/unit/org/openstreetmap/josm/plugins/rapid/backend/DeletePrimitivesCommandTest.java
rename to test/unit/org/openstreetmap/josm/plugins/rapid/commands/DeletePrimitivesCommandTest.java
index 97c4142..ded6b9e 100644
--- a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/DeletePrimitivesCommandTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/DeletePrimitivesCommandTest.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import java.util.Collections;
 
@@ -11,6 +11,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.rapid.commands.DeletePrimitivesCommand;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 public class DeletePrimitivesCommandTest {
diff --git a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/MovePrimitiveDataSetCommandTest.java b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/MovePrimitiveDataSetCommandTest.java
similarity index 93%
rename from test/unit/org/openstreetmap/josm/plugins/rapid/backend/MovePrimitiveDataSetCommandTest.java
rename to test/unit/org/openstreetmap/josm/plugins/rapid/commands/MovePrimitiveDataSetCommandTest.java
index 129581f..50234c5 100644
--- a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/MovePrimitiveDataSetCommandTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/MovePrimitiveDataSetCommandTest.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import java.util.Collections;
 
@@ -11,6 +11,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.rapid.commands.MovePrimitiveDataSetCommand;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 public class MovePrimitiveDataSetCommandTest {
diff --git a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/RapiDAddComandTest.java b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/RapiDAddComandTest.java
similarity index 97%
rename from test/unit/org/openstreetmap/josm/plugins/rapid/backend/RapiDAddComandTest.java
rename to test/unit/org/openstreetmap/josm/plugins/rapid/commands/RapiDAddComandTest.java
index e69bed6..9f0797b 100644
--- a/test/unit/org/openstreetmap/josm/plugins/rapid/backend/RapiDAddComandTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/rapid/commands/RapiDAddComandTest.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.rapid.backend;
+package org.openstreetmap.josm.plugins.rapid.commands;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,6 +13,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.rapid.commands.RapiDAddCommand;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 public class RapiDAddComandTest {