diff --git a/library/Icinga/Protocol/Commandpipe/Command.php b/modules/monitoring/library/Monitoring/Command/Command.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Command.php
rename to modules/monitoring/library/Monitoring/Command/Command.php
diff --git a/library/Icinga/Protocol/Commandpipe/CommandPipe.php b/modules/monitoring/library/Monitoring/Command/CommandPipe.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/CommandPipe.php
rename to modules/monitoring/library/Monitoring/Command/CommandPipe.php
diff --git a/library/Icinga/Protocol/Commandpipe/Comment.php b/modules/monitoring/library/Monitoring/Command/Comment.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Comment.php
rename to modules/monitoring/library/Monitoring/Command/Comment.php
diff --git a/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php b/modules/monitoring/library/Monitoring/Command/Exception/InvalidCommandException.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
rename to modules/monitoring/library/Monitoring/Command/Exception/InvalidCommandException.php
diff --git a/library/Icinga/Protocol/Commandpipe/PropertyModifier.php b/modules/monitoring/library/Monitoring/Command/PropertyModifier.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/PropertyModifier.php
rename to modules/monitoring/library/Monitoring/Command/PropertyModifier.php
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/LocalPipe.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalPipe.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Transport/LocalPipe.php
rename to modules/monitoring/library/Monitoring/Command/Transport/LocalPipe.php
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/SecureShell.php b/modules/monitoring/library/Monitoring/Command/Transport/SecureShell.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Transport/SecureShell.php
rename to modules/monitoring/library/Monitoring/Command/Transport/SecureShell.php
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/Transport.php b/modules/monitoring/library/Monitoring/Command/Transport/Transport.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Transport/Transport.php
rename to modules/monitoring/library/Monitoring/Command/Transport/Transport.php