diff --git a/client/pom.xml b/client/pom.xml
index 4d1c11894de..29fef4f335e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -749,7 +749,7 @@
           <plugin>
             <groupId>org.apache.cloudstack</groupId>
             <artifactId>Wix-cloudstack-maven-plugin</artifactId>
-            <version>4.5.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <executions>
               <execution>
                 <id>wix-cs</id>
diff --git a/pom.xml b/pom.xml
index e7f56f96cce..0b3b56e7aa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1059,5 +1059,16 @@
         </plugins>
       </build>
     </profile>  
+    <profile>
+      <id>buildw</id>
+      <activation>
+        <property>
+          <name>buildw</name>
+        </property>
+      </activation>
+      <modules>
+        <module>tools/wix-cloudstack-maven-plugin</module>
+      </modules>
+    </profile>
   </profiles>
 </project>
diff --git a/Wix-cloudstack-maven-plugin/pom.xml b/tools/wix-cloudstack-maven-plugin/pom.xml
similarity index 96%
rename from Wix-cloudstack-maven-plugin/pom.xml
rename to tools/wix-cloudstack-maven-plugin/pom.xml
index 0ce356ce2da..7b89b0748c6 100644
--- a/Wix-cloudstack-maven-plugin/pom.xml
+++ b/tools/wix-cloudstack-maven-plugin/pom.xml
@@ -11,12 +11,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Wix-cloudstack-maven-plugin</artifactId>
-  <name>Wix-cloudstack-maven-plugin</name>
+  <name>Apache CloudStack - Wix Maven Plugin</name>
   <packaging>maven-plugin</packaging>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
     <version>4.5.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <dependencies>
@@ -74,4 +75,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/Wix-cloudstack-maven-plugin/src/org/apache/cloudstack/wix/HeatMojo.java b/tools/wix-cloudstack-maven-plugin/src/org/apache/cloudstack/wix/HeatMojo.java
similarity index 100%
rename from Wix-cloudstack-maven-plugin/src/org/apache/cloudstack/wix/HeatMojo.java
rename to tools/wix-cloudstack-maven-plugin/src/org/apache/cloudstack/wix/HeatMojo.java