diff --git a/XenAdmin/SettingsPanels/NRPEEditPage.cs b/XenAdmin/SettingsPanels/NRPEEditPage.cs
index eae55f6b1..d89080012 100644
--- a/XenAdmin/SettingsPanels/NRPEEditPage.cs
+++ b/XenAdmin/SettingsPanels/NRPEEditPage.cs
@@ -29,13 +29,15 @@
  */
 
 using System;
-using System.Drawing;
-using System.Windows.Forms;
-using XenAPI;
-using XenAdmin.Actions;
 using System.Collections.Generic;
-using XenAdmin.Core;
+using System.Drawing;
 using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using XenAdmin.Actions;
+using XenAdmin.Core;
+using XenAdmin.Actions.NRPE;
+using XenAPI;
+
 
 namespace XenAdmin.SettingsPanels
 {
diff --git a/XenModel/NRPE/NRPEHostConfiguration.cs b/XenModel/Actions/NRPE/NRPEHostConfiguration.cs
similarity index 96%
rename from XenModel/NRPE/NRPEHostConfiguration.cs
rename to XenModel/Actions/NRPE/NRPEHostConfiguration.cs
index 597556aac..c143a3cca 100644
--- a/XenModel/NRPE/NRPEHostConfiguration.cs
+++ b/XenModel/Actions/NRPE/NRPEHostConfiguration.cs
@@ -31,7 +31,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace XenAdmin
+namespace XenAdmin.Actions.NRPE
 {
     public class NRPEHostConfiguration : ICloneable
     {
diff --git a/XenModel/Actions/Host/NRPEUpdateAction.cs b/XenModel/Actions/NRPE/NRPEUpdateAction.cs
similarity index 97%
rename from XenModel/Actions/Host/NRPEUpdateAction.cs
rename to XenModel/Actions/NRPE/NRPEUpdateAction.cs
index 38eefe94b..05cb749db 100644
--- a/XenModel/Actions/Host/NRPEUpdateAction.cs
+++ b/XenModel/Actions/NRPE/NRPEUpdateAction.cs
@@ -33,7 +33,7 @@ using System.Linq;
 using XenAPI;
 
 
-namespace XenAdmin.Actions
+namespace XenAdmin.Actions.NRPE
 {
     public class NRPEUpdateAction : AsyncAction
     {
diff --git a/XenModel/XenModel.csproj b/XenModel/XenModel.csproj
index 949403fbd..2850c5ca4 100755
--- a/XenModel/XenModel.csproj
+++ b/XenModel/XenModel.csproj
@@ -88,7 +88,7 @@
     <Compile Include="Actions\Host\HostAbstractAction.cs" />
     <Compile Include="Actions\Host\RebootHostAction.cs" />
     <Compile Include="Actions\Host\RestartToolstackAction.cs" />
-    <Compile Include="Actions\Host\NRPEUpdateAction.cs" />
+    <Compile Include="Actions\NRPE\NRPEUpdateAction.cs" />
     <Compile Include="Actions\Host\ShutdownHostAction.cs" />
     <Compile Include="Actions\Host\UpdateIntegratedGpuPassthroughAction.cs" />
     <Compile Include="Actions\DummyAction.cs" />
@@ -199,7 +199,7 @@
     <Compile Include="Utils\Helpers.Versions.cs" />
     <Compile Include="Utils\StringExtensions.cs" />
     <Compile Include="Utils\TimeSpanExtensions.cs" />
-    <Compile Include="NRPE\NRPEHostConfiguration.cs" />
+    <Compile Include="Actions\NRPE\NRPEHostConfiguration.cs" />
     <Compile Include="WLB\WlbPoolConfiguration.cs" />
     <Compile Include="WLB\WlbReportInfo.cs" />
     <Compile Include="WLB\WlbReportSubscription.cs" />