diff --git a/DiscoverUM3Action.py b/plugins/UM3NetworkPrintingPlugin/DiscoverUM3Action.py
similarity index 100%
rename from DiscoverUM3Action.py
rename to plugins/UM3NetworkPrintingPlugin/DiscoverUM3Action.py
diff --git a/DiscoverUM3Action.qml b/plugins/UM3NetworkPrintingPlugin/DiscoverUM3Action.qml
similarity index 100%
rename from DiscoverUM3Action.qml
rename to plugins/UM3NetworkPrintingPlugin/DiscoverUM3Action.qml
diff --git a/NetworkPrinterOutputDevice.py b/plugins/UM3NetworkPrintingPlugin/NetworkPrinterOutputDevice.py
similarity index 100%
rename from NetworkPrinterOutputDevice.py
rename to plugins/UM3NetworkPrintingPlugin/NetworkPrinterOutputDevice.py
diff --git a/NetworkPrinterOutputDevicePlugin.py b/plugins/UM3NetworkPrintingPlugin/NetworkPrinterOutputDevicePlugin.py
similarity index 100%
rename from NetworkPrinterOutputDevicePlugin.py
rename to plugins/UM3NetworkPrintingPlugin/NetworkPrinterOutputDevicePlugin.py
diff --git a/UM3InfoComponents.qml b/plugins/UM3NetworkPrintingPlugin/UM3InfoComponents.qml
similarity index 100%
rename from UM3InfoComponents.qml
rename to plugins/UM3NetworkPrintingPlugin/UM3InfoComponents.qml
diff --git a/__init__.py b/plugins/UM3NetworkPrintingPlugin/__init__.py
similarity index 100%
rename from __init__.py
rename to plugins/UM3NetworkPrintingPlugin/__init__.py