diff --git a/java/src/jmri/server/json/idtag/Bundle.java b/java/src/jmri/server/json/idtag-temp/Bundle.java
similarity index 100%
rename from java/src/jmri/server/json/idtag/Bundle.java
rename to java/src/jmri/server/json/idtag-temp/Bundle.java
diff --git a/java/src/jmri/server/json/idtag/JsonIdTag.java b/java/src/jmri/server/json/idtag-temp/JsonIdTag.java
similarity index 100%
rename from java/src/jmri/server/json/idtag/JsonIdTag.java
rename to java/src/jmri/server/json/idtag-temp/JsonIdTag.java
diff --git a/java/src/jmri/server/json/idtag/JsonIdTagHttpService.java b/java/src/jmri/server/json/idtag-temp/JsonIdTagHttpService.java
similarity index 100%
rename from java/src/jmri/server/json/idtag/JsonIdTagHttpService.java
rename to java/src/jmri/server/json/idtag-temp/JsonIdTagHttpService.java
diff --git a/java/src/jmri/server/json/idtag/JsonIdTagServiceFactory.java b/java/src/jmri/server/json/idtag-temp/JsonIdTagServiceFactory.java
similarity index 100%
rename from java/src/jmri/server/json/idtag/JsonIdTagServiceFactory.java
rename to java/src/jmri/server/json/idtag-temp/JsonIdTagServiceFactory.java
diff --git a/java/src/jmri/server/json/idtag/JsonIdTagSocketService.java b/java/src/jmri/server/json/idtag-temp/JsonIdTagSocketService.java
similarity index 100%
rename from java/src/jmri/server/json/idtag/JsonIdTagSocketService.java
rename to java/src/jmri/server/json/idtag-temp/JsonIdTagSocketService.java
diff --git a/java/src/jmri/server/json/idtag/idTag-client.json b/java/src/jmri/server/json/idtag-temp/idTag-client.json
similarity index 100%
rename from java/src/jmri/server/json/idtag/idTag-client.json
rename to java/src/jmri/server/json/idtag-temp/idTag-client.json
diff --git a/java/src/jmri/server/json/idtag/idTag-server.json b/java/src/jmri/server/json/idtag-temp/idTag-server.json
similarity index 100%
rename from java/src/jmri/server/json/idtag/idTag-server.json
rename to java/src/jmri/server/json/idtag-temp/idTag-server.json
diff --git a/java/src/jmri/server/json/signalhead/Bundle.java b/java/src/jmri/server/json/signalhead-temp/Bundle.java
similarity index 100%
rename from java/src/jmri/server/json/signalhead/Bundle.java
rename to java/src/jmri/server/json/signalhead-temp/Bundle.java
diff --git a/java/src/jmri/server/json/signalhead/JsonSignalHead.java b/java/src/jmri/server/json/signalhead-temp/JsonSignalHead.java
similarity index 100%
rename from java/src/jmri/server/json/signalhead/JsonSignalHead.java
rename to java/src/jmri/server/json/signalhead-temp/JsonSignalHead.java
diff --git a/java/src/jmri/server/json/signalhead/JsonSignalHeadHttpService.java b/java/src/jmri/server/json/signalhead-temp/JsonSignalHeadHttpService.java
similarity index 100%
rename from java/src/jmri/server/json/signalhead/JsonSignalHeadHttpService.java
rename to java/src/jmri/server/json/signalhead-temp/JsonSignalHeadHttpService.java
diff --git a/java/src/jmri/server/json/signalhead/JsonSignalHeadServiceFactory.java b/java/src/jmri/server/json/signalhead-temp/JsonSignalHeadServiceFactory.java
similarity index 100%
rename from java/src/jmri/server/json/signalhead/JsonSignalHeadServiceFactory.java
rename to java/src/jmri/server/json/signalhead-temp/JsonSignalHeadServiceFactory.java
diff --git a/java/src/jmri/server/json/signalhead/JsonSignalHeadSocketService.java b/java/src/jmri/server/json/signalhead-temp/JsonSignalHeadSocketService.java
similarity index 100%
rename from java/src/jmri/server/json/signalhead/JsonSignalHeadSocketService.java
rename to java/src/jmri/server/json/signalhead-temp/JsonSignalHeadSocketService.java
diff --git a/java/src/jmri/server/json/signalhead/signalHead-client.json b/java/src/jmri/server/json/signalhead-temp/signalHead-client.json
similarity index 100%
rename from java/src/jmri/server/json/signalhead/signalHead-client.json
rename to java/src/jmri/server/json/signalhead-temp/signalHead-client.json
diff --git a/java/src/jmri/server/json/signalhead/signalHead-server.json b/java/src/jmri/server/json/signalhead-temp/signalHead-server.json
similarity index 100%
rename from java/src/jmri/server/json/signalhead/signalHead-server.json
rename to java/src/jmri/server/json/signalhead-temp/signalHead-server.json
diff --git a/java/src/jmri/server/json/signalmast/Bundle.java b/java/src/jmri/server/json/signalmast-temp/Bundle.java
similarity index 100%
rename from java/src/jmri/server/json/signalmast/Bundle.java
rename to java/src/jmri/server/json/signalmast-temp/Bundle.java
diff --git a/java/src/jmri/server/json/signalmast/JsonSignalMast.java b/java/src/jmri/server/json/signalmast-temp/JsonSignalMast.java
similarity index 100%
rename from java/src/jmri/server/json/signalmast/JsonSignalMast.java
rename to java/src/jmri/server/json/signalmast-temp/JsonSignalMast.java
diff --git a/java/src/jmri/server/json/signalmast/JsonSignalMastHttpService.java b/java/src/jmri/server/json/signalmast-temp/JsonSignalMastHttpService.java
similarity index 100%
rename from java/src/jmri/server/json/signalmast/JsonSignalMastHttpService.java
rename to java/src/jmri/server/json/signalmast-temp/JsonSignalMastHttpService.java
diff --git a/java/src/jmri/server/json/signalmast/JsonSignalMastServiceFactory.java b/java/src/jmri/server/json/signalmast-temp/JsonSignalMastServiceFactory.java
similarity index 100%
rename from java/src/jmri/server/json/signalmast/JsonSignalMastServiceFactory.java
rename to java/src/jmri/server/json/signalmast-temp/JsonSignalMastServiceFactory.java
diff --git a/java/src/jmri/server/json/signalmast/JsonSignalMastSocketService.java b/java/src/jmri/server/json/signalmast-temp/JsonSignalMastSocketService.java
similarity index 100%
rename from java/src/jmri/server/json/signalmast/JsonSignalMastSocketService.java
rename to java/src/jmri/server/json/signalmast-temp/JsonSignalMastSocketService.java
diff --git a/java/src/jmri/server/json/signalmast/signalMast-client.json b/java/src/jmri/server/json/signalmast-temp/signalMast-client.json
similarity index 100%
rename from java/src/jmri/server/json/signalmast/signalMast-client.json
rename to java/src/jmri/server/json/signalmast-temp/signalMast-client.json
diff --git a/java/src/jmri/server/json/signalmast/signalMast-server.json b/java/src/jmri/server/json/signalmast-temp/signalMast-server.json
similarity index 100%
rename from java/src/jmri/server/json/signalmast/signalMast-server.json
rename to java/src/jmri/server/json/signalmast-temp/signalMast-server.json
diff --git a/java/test/jmri/server/json/idtag/BundleTest.java b/java/test/jmri/server/json/idtag-temp/BundleTest.java
similarity index 100%
rename from java/test/jmri/server/json/idtag/BundleTest.java
rename to java/test/jmri/server/json/idtag-temp/BundleTest.java
diff --git a/java/test/jmri/server/json/idtag/JsonIdTagHttpServiceTest.java b/java/test/jmri/server/json/idtag-temp/JsonIdTagHttpServiceTest.java
similarity index 100%
rename from java/test/jmri/server/json/idtag/JsonIdTagHttpServiceTest.java
rename to java/test/jmri/server/json/idtag-temp/JsonIdTagHttpServiceTest.java
diff --git a/java/test/jmri/server/json/idtag/JsonIdTagSocketServiceTest.java b/java/test/jmri/server/json/idtag-temp/JsonIdTagSocketServiceTest.java
similarity index 100%
rename from java/test/jmri/server/json/idtag/JsonIdTagSocketServiceTest.java
rename to java/test/jmri/server/json/idtag-temp/JsonIdTagSocketServiceTest.java
diff --git a/java/test/jmri/server/json/idtag/JsonIdTagTest.java b/java/test/jmri/server/json/idtag-temp/JsonIdTagTest.java
similarity index 100%
rename from java/test/jmri/server/json/idtag/JsonIdTagTest.java
rename to java/test/jmri/server/json/idtag-temp/JsonIdTagTest.java
diff --git a/java/test/jmri/server/json/signalhead/BundleTest.java b/java/test/jmri/server/json/signalhead-temp/BundleTest.java
similarity index 100%
rename from java/test/jmri/server/json/signalhead/BundleTest.java
rename to java/test/jmri/server/json/signalhead-temp/BundleTest.java
diff --git a/java/test/jmri/server/json/signalhead/JsonSignalHeadHttpServiceTest.java b/java/test/jmri/server/json/signalhead-temp/JsonSignalHeadHttpServiceTest.java
similarity index 100%
rename from java/test/jmri/server/json/signalhead/JsonSignalHeadHttpServiceTest.java
rename to java/test/jmri/server/json/signalhead-temp/JsonSignalHeadHttpServiceTest.java
diff --git a/java/test/jmri/server/json/signalhead/JsonSignalHeadSocketServiceTest.java b/java/test/jmri/server/json/signalhead-temp/JsonSignalHeadSocketServiceTest.java
similarity index 100%
rename from java/test/jmri/server/json/signalhead/JsonSignalHeadSocketServiceTest.java
rename to java/test/jmri/server/json/signalhead-temp/JsonSignalHeadSocketServiceTest.java
diff --git a/java/test/jmri/server/json/signalhead/JsonSignalHeadTest.java b/java/test/jmri/server/json/signalhead-temp/JsonSignalHeadTest.java
similarity index 100%
rename from java/test/jmri/server/json/signalhead/JsonSignalHeadTest.java
rename to java/test/jmri/server/json/signalhead-temp/JsonSignalHeadTest.java
diff --git a/java/test/jmri/server/json/signalmast/BundleTest.java b/java/test/jmri/server/json/signalmast-temp/BundleTest.java
similarity index 100%
rename from java/test/jmri/server/json/signalmast/BundleTest.java
rename to java/test/jmri/server/json/signalmast-temp/BundleTest.java
diff --git a/java/test/jmri/server/json/signalmast/JsonSignalMastHttpServiceTest.java b/java/test/jmri/server/json/signalmast-temp/JsonSignalMastHttpServiceTest.java
similarity index 100%
rename from java/test/jmri/server/json/signalmast/JsonSignalMastHttpServiceTest.java
rename to java/test/jmri/server/json/signalmast-temp/JsonSignalMastHttpServiceTest.java
diff --git a/java/test/jmri/server/json/signalmast/JsonSignalMastSocketServiceTest.java b/java/test/jmri/server/json/signalmast-temp/JsonSignalMastSocketServiceTest.java
similarity index 100%
rename from java/test/jmri/server/json/signalmast/JsonSignalMastSocketServiceTest.java
rename to java/test/jmri/server/json/signalmast-temp/JsonSignalMastSocketServiceTest.java
diff --git a/java/test/jmri/server/json/signalmast/JsonSignalMastTest.java b/java/test/jmri/server/json/signalmast-temp/JsonSignalMastTest.java
similarity index 100%
rename from java/test/jmri/server/json/signalmast/JsonSignalMastTest.java
rename to java/test/jmri/server/json/signalmast-temp/JsonSignalMastTest.java