diff --git a/src/main/java/de/neemann/digital/core/wiring/NFET.java b/src/main/java/de/neemann/digital/core/switching/NFET.java
similarity index 95%
rename from src/main/java/de/neemann/digital/core/wiring/NFET.java
rename to src/main/java/de/neemann/digital/core/switching/NFET.java
index 4fa6887ae..686adf763 100644
--- a/src/main/java/de/neemann/digital/core/wiring/NFET.java
+++ b/src/main/java/de/neemann/digital/core/switching/NFET.java
@@ -1,4 +1,4 @@
-package de.neemann.digital.core.wiring;
+package de.neemann.digital.core.switching;
 
 import de.neemann.digital.core.element.ElementAttributes;
 import de.neemann.digital.core.element.ElementTypeDescription;
diff --git a/src/main/java/de/neemann/digital/core/wiring/PFET.java b/src/main/java/de/neemann/digital/core/switching/PFET.java
similarity index 96%
rename from src/main/java/de/neemann/digital/core/wiring/PFET.java
rename to src/main/java/de/neemann/digital/core/switching/PFET.java
index 5671bc561..ecaf8b801 100644
--- a/src/main/java/de/neemann/digital/core/wiring/PFET.java
+++ b/src/main/java/de/neemann/digital/core/switching/PFET.java
@@ -1,4 +1,4 @@
-package de.neemann.digital.core.wiring;
+package de.neemann.digital.core.switching;
 
 import de.neemann.digital.core.element.ElementAttributes;
 import de.neemann.digital.core.element.ElementTypeDescription;
diff --git a/src/main/java/de/neemann/digital/core/wiring/Relay.java b/src/main/java/de/neemann/digital/core/switching/Relay.java
similarity index 98%
rename from src/main/java/de/neemann/digital/core/wiring/Relay.java
rename to src/main/java/de/neemann/digital/core/switching/Relay.java
index be753ffc4..a638a7ba8 100644
--- a/src/main/java/de/neemann/digital/core/wiring/Relay.java
+++ b/src/main/java/de/neemann/digital/core/switching/Relay.java
@@ -1,4 +1,4 @@
-package de.neemann.digital.core.wiring;
+package de.neemann.digital.core.switching;
 
 import de.neemann.digital.core.*;
 import de.neemann.digital.core.element.Element;
diff --git a/src/main/java/de/neemann/digital/core/wiring/Switch.java b/src/main/java/de/neemann/digital/core/switching/Switch.java
similarity index 99%
rename from src/main/java/de/neemann/digital/core/wiring/Switch.java
rename to src/main/java/de/neemann/digital/core/switching/Switch.java
index b9560305b..655ea6d9e 100644
--- a/src/main/java/de/neemann/digital/core/wiring/Switch.java
+++ b/src/main/java/de/neemann/digital/core/switching/Switch.java
@@ -1,4 +1,4 @@
-package de.neemann.digital.core.wiring;
+package de.neemann.digital.core.switching;
 
 import de.neemann.digital.core.*;
 import de.neemann.digital.core.element.Element;
diff --git a/src/main/java/de/neemann/digital/core/switching/package-info.java b/src/main/java/de/neemann/digital/core/switching/package-info.java
new file mode 100644
index 000000000..b24bfa280
--- /dev/null
+++ b/src/main/java/de/neemann/digital/core/switching/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * This package contains all the switching components
+ * Created by hneemann on 26.02.17.
+ */
+package de.neemann.digital.core.switching;
diff --git a/src/main/java/de/neemann/digital/core/wiring/bus/BusModelStateObserver.java b/src/main/java/de/neemann/digital/core/wiring/bus/BusModelStateObserver.java
index 14fd9b135..a72705d92 100644
--- a/src/main/java/de/neemann/digital/core/wiring/bus/BusModelStateObserver.java
+++ b/src/main/java/de/neemann/digital/core/wiring/bus/BusModelStateObserver.java
@@ -2,7 +2,7 @@ package de.neemann.digital.core.wiring.bus;
 
 import de.neemann.digital.core.ModelEvent;
 import de.neemann.digital.core.ModelStateObserver;
-import de.neemann.digital.core.wiring.Switch;
+import de.neemann.digital.core.switching.Switch;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java b/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java
index ce3919d00..3beb391d7 100644
--- a/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java
+++ b/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java
@@ -14,6 +14,10 @@ import de.neemann.digital.core.pld.DiodeBackward;
 import de.neemann.digital.core.pld.DiodeForeward;
 import de.neemann.digital.core.pld.PullDown;
 import de.neemann.digital.core.pld.PullUp;
+import de.neemann.digital.core.switching.NFET;
+import de.neemann.digital.core.switching.PFET;
+import de.neemann.digital.core.switching.Relay;
+import de.neemann.digital.core.switching.Switch;
 import de.neemann.digital.core.wiring.*;
 import de.neemann.digital.draw.elements.Tunnel;
 import de.neemann.digital.gui.components.data.DummyElement;
diff --git a/src/main/java/de/neemann/digital/draw/shapes/FETShape.java b/src/main/java/de/neemann/digital/draw/shapes/FETShape.java
index 375dd6d0a..897e0b0aa 100644
--- a/src/main/java/de/neemann/digital/draw/shapes/FETShape.java
+++ b/src/main/java/de/neemann/digital/draw/shapes/FETShape.java
@@ -3,7 +3,7 @@ package de.neemann.digital.draw.shapes;
 import de.neemann.digital.core.Observer;
 import de.neemann.digital.core.element.ElementAttributes;
 import de.neemann.digital.core.element.PinDescriptions;
-import de.neemann.digital.core.wiring.Relay;
+import de.neemann.digital.core.switching.Relay;
 import de.neemann.digital.draw.elements.IOState;
 import de.neemann.digital.draw.graphics.*;
 
diff --git a/src/main/java/de/neemann/digital/draw/shapes/ShapeFactory.java b/src/main/java/de/neemann/digital/draw/shapes/ShapeFactory.java
index 5b24ea9e6..804d5deba 100644
--- a/src/main/java/de/neemann/digital/draw/shapes/ShapeFactory.java
+++ b/src/main/java/de/neemann/digital/draw/shapes/ShapeFactory.java
@@ -10,6 +10,10 @@ import de.neemann.digital.core.io.*;
 import de.neemann.digital.core.memory.RAMDualPort;
 import de.neemann.digital.core.memory.RAMSinglePort;
 import de.neemann.digital.core.pld.*;
+import de.neemann.digital.core.switching.NFET;
+import de.neemann.digital.core.switching.PFET;
+import de.neemann.digital.core.switching.Relay;
+import de.neemann.digital.core.switching.Switch;
 import de.neemann.digital.core.wiring.*;
 import de.neemann.digital.draw.elements.PinException;
 import de.neemann.digital.draw.elements.Tunnel;
diff --git a/src/main/java/de/neemann/digital/draw/shapes/SwitchShape.java b/src/main/java/de/neemann/digital/draw/shapes/SwitchShape.java
index b8ab81d4e..9748b6ffc 100644
--- a/src/main/java/de/neemann/digital/draw/shapes/SwitchShape.java
+++ b/src/main/java/de/neemann/digital/draw/shapes/SwitchShape.java
@@ -5,7 +5,7 @@ import de.neemann.digital.core.element.Element;
 import de.neemann.digital.core.element.ElementAttributes;
 import de.neemann.digital.core.element.Keys;
 import de.neemann.digital.core.element.PinDescriptions;
-import de.neemann.digital.core.wiring.Switch;
+import de.neemann.digital.core.switching.Switch;
 import de.neemann.digital.draw.elements.IOState;
 import de.neemann.digital.draw.elements.Pin;
 import de.neemann.digital.draw.elements.Pins;