diff --git a/platform/api/pom.xml b/platform/api/pom.xml
index cfabe3bb95b..b38e3887052 100644
--- a/platform/api/pom.xml
+++ b/platform/api/pom.xml
@@ -4,9 +4,9 @@
   <artifactId>cloud-platform-api</artifactId>
   <name>Apache CloudStack platform API</name>
   <parent>
-		<groupId>org.apache.cloudstack</groupId>
-		<artifactId>cloud-parent</artifactId>
-		<version>${project.version}</version>
+    	<groupId>org.apache.cloudstack</groupId>
+    	<artifactId>cloudstack</artifactId>
+    	<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
   <dependencies>
diff --git a/platform/api/src/org/apache/cloudstack/platform/subsystem/api/storage/TemplateProfile.java b/platform/api/src/org/apache/cloudstack/platform/subsystem/api/storage/TemplateProfile.java
new file mode 100755
index 00000000000..b050f40accb
--- /dev/null
+++ b/platform/api/src/org/apache/cloudstack/platform/subsystem/api/storage/TemplateProfile.java
@@ -0,0 +1,255 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.template;
+
+import java.util.Map;
+
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.storage.VMTemplateVO;
+
+public class TemplateProfile {	
+	Long userId;
+	String name;
+	String displayText;
+	Integer bits;
+	Boolean passwordEnabled;
+	Boolean sshKeyEnbaled;
+	Boolean requiresHvm;
+	String url;
+	Boolean isPublic;
+	Boolean featured;
+	Boolean isExtractable;
+	ImageFormat format;
+	Long guestOsId;
+	Long zoneId;
+	HypervisorType hypervisorType;
+	String accountName;
+	Long domainId;
+	Long accountId;
+	String chksum;
+	Boolean bootable;
+	Long templateId;
+	VMTemplateVO template;
+	String templateTag;
+	Map details;
+	
+	public TemplateProfile(Long templateId, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHvm,
+			String url, Boolean isPublic, Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, Long zoneId,
+			HypervisorType hypervisorType, String accountName, Long domainId, Long accountId, String chksum, Boolean bootable, Map details, Boolean sshKeyEnabled) {
+		this.templateId = templateId;
+		this.userId = userId;
+		this.name = name;
+		this.displayText = displayText;
+		this.bits = bits;
+		this.passwordEnabled = passwordEnabled;
+		this.requiresHvm = requiresHvm;
+		this.url = url;
+		this.isPublic = isPublic;
+		this.featured = featured;
+		this.isExtractable = isExtractable;
+		this.format = format;
+		this.guestOsId = guestOsId;
+		this.zoneId = zoneId;
+		this.hypervisorType = hypervisorType;
+		this.accountName = accountName;
+		this.domainId = domainId;
+		this.accountId = accountId;
+		this.chksum = chksum;
+		this.bootable = bootable;
+		this.details = details;
+		this.sshKeyEnbaled = sshKeyEnabled;
+	}
+	
+	public TemplateProfile(Long userId, VMTemplateVO template, Long zoneId) {
+		this.userId = userId;
+		this.template = template;
+		this.zoneId = zoneId;
+	}
+	
+    public TemplateProfile(Long templateId, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHvm,
+            String url, Boolean isPublic, Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, Long zoneId,
+            HypervisorType hypervisorType, String accountName, Long domainId, Long accountId, String chksum, Boolean bootable, String templateTag, Map details, Boolean sshKeyEnabled) {
+        this(templateId, userId, name, displayText, bits, passwordEnabled, requiresHvm, url, isPublic, featured, isExtractable, format, guestOsId, zoneId,
+                hypervisorType, accountName, domainId, accountId, chksum, bootable, details, sshKeyEnabled);
+        this.templateTag = templateTag;
+    }	
+	
+	public Long getTemplateId() {
+		return templateId;
+	}
+	public void setTemplateId(Long id) {
+		this.templateId = id;
+	}
+	
+	public Long getUserId() {
+		return userId;
+	}
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public String getDisplayText() {
+		return displayText;
+	}
+	public void setDisplayText(String text) {
+		this.displayText = text;
+	}
+	
+	public Integer getBits() {
+		return bits;
+	}
+	public void setBits(Integer bits) {
+		this.bits = bits;
+	}
+	
+	public Boolean getPasswordEnabled() {
+		return passwordEnabled;
+	}
+	public void setPasswordEnabled(Boolean enabled) {
+		this.passwordEnabled = enabled;
+	}
+	
+	public Boolean getRequiresHVM() {
+		return requiresHvm;
+	}
+	public void setRequiresHVM(Boolean hvm) {
+		this.requiresHvm = hvm;
+	}
+	
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	
+	public Boolean getIsPublic() {
+		return isPublic;
+	}
+	public void setIsPublic(Boolean is) {
+		this.isPublic = is;
+	}
+	
+	public Boolean getFeatured() {
+		return featured;
+	}
+	public void setFeatured(Boolean featured) {
+		this.featured = featured;
+	}
+	
+	public Boolean getIsExtractable() {
+		return isExtractable;
+	}
+	public void setIsExtractable(Boolean is) {
+		this.isExtractable = is;
+	}
+	
+	public ImageFormat getFormat() {
+		return format;
+	}
+	public void setFormat(ImageFormat format) {
+		this.format = format;
+	}
+	
+	public Long getGuestOsId() {
+		return guestOsId;
+	}
+	public void setGuestOsId(Long id) {
+		this.guestOsId = id;
+	}
+	
+	public Long getZoneId() {
+		return zoneId;
+	}
+	public void setZoneId(Long id) {
+		this.zoneId = id;
+	}
+	
+	public HypervisorType getHypervisorType() {
+		return hypervisorType;
+	}
+	public void setHypervisorType(HypervisorType type) {
+		this.hypervisorType = type;
+	}
+	
+	public Long getDomainId() {
+		return domainId;
+	}
+	public void setDomainId(Long id) {
+		this.domainId = id;
+	}
+	
+	public Long getAccountId() {
+		return accountId;
+	}
+	public void setAccountId(Long id) {
+		this.accountId = id;
+	}
+	
+	public String getCheckSum() {
+		return chksum;
+	}
+	public void setCheckSum(String chksum) {
+		this.chksum = chksum;
+	}
+	
+	public Boolean getBootable() {
+		return this.bootable;
+	}
+	public void setBootable(Boolean bootable) {
+		this.bootable = bootable;
+	}
+	
+	public VMTemplateVO getTemplate() {
+		return template;
+	}
+	public void setTemplate(VMTemplateVO template) {
+		this.template = template;
+	}
+	
+    public String getTemplateTag() {
+        return templateTag;
+    }    
+
+    public void setTemplateTag(String templateTag) {
+        this.templateTag = templateTag;
+    }  	
+	
+    public Map getDetails() {
+    	return this.details;
+    }
+    
+    public void setDetails(Map details) {
+    	this.details = details;
+    }
+    
+    public void setSshKeyEnabled(Boolean enabled) {
+    	this.sshKeyEnbaled = enabled;
+    }
+    
+    public Boolean getSshKeyEnabled() {
+    	return this.sshKeyEnbaled;
+    }
+}
diff --git a/platform/storage/pom.xml b/platform/storage/pom.xml
index 852c7d7f035..c867e20cc6e 100644
--- a/platform/storage/pom.xml
+++ b/platform/storage/pom.xml
@@ -3,29 +3,29 @@
   <artifactId>cloud-platform-storage</artifactId>
   <name>Apache CloudStack Platform Storage</name>
   <parent>
-	<groupId>com.cloud</groupId>
-	<artifactId>cloud-parent</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
-	<relativePath>../../parent/pom.xml</relativePath>
+    	<groupId>org.apache.cloudstack</groupId>
+    	<artifactId>cloudstack</artifactId>
+    	<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
   <dependencies>
 		<dependency>
-			<groupId>com.cloud</groupId>
+			<groupId>org.apache.cloudstack</groupId>
 			<artifactId>cloud-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.cloud</groupId>
+			<groupId>org.apache.cloudstack</groupId>
 			<artifactId>cloud-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.cloud</groupId>
+			<groupId>org.apache.cloudstack</groupId>
 			<artifactId>cloud-server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.cloud</groupId>
+			<groupId>org.apache.cloudstack</groupId>
 			<artifactId>cloud-platform-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/server/pom.xml b/server/pom.xml
index 29922b62cb5..ff7755ee63e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -26,6 +26,11 @@
     <version>4.1.0-SNAPSHOT</version>
   </parent>
   <dependencies>
+  	<dependency>
+		<groupId>org.apache.cloudstack</groupId>
+		<artifactId>cloud-platform-api</artifactId>
+		<version>${project.version}</version>
+	</dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-core</artifactId>