diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/RFC3339DateFormat.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/RFC3339DateFormat.java
similarity index 91%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/RFC3339DateFormat.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/RFC3339DateFormat.java
index a1c4d12..7819144 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/RFC3339DateFormat.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/RFC3339DateFormat.java
@@ -1,4 +1,4 @@
-package org.irods.jargon.irodsext.mdtemplate.service;
+package org.irods.jargon.irodsext.mdtemplate;
 
 import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
 import com.fasterxml.jackson.databind.util.ISO8601Utils;
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/Swagger2SpringBoot.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/Swagger2SpringBoot.java
similarity index 89%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/Swagger2SpringBoot.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/Swagger2SpringBoot.java
index fb7aebb..899a4ee 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/Swagger2SpringBoot.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/Swagger2SpringBoot.java
@@ -1,4 +1,4 @@
-package org.irods.jargon.irodsext.mdtemplate.service;
+package org.irods.jargon.irodsext.mdtemplate;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.ExitCodeGenerator;
@@ -10,7 +10,7 @@
 
 @SpringBootApplication
 @EnableSwagger2
-@ComponentScan(basePackages = { "org.irods.jargon.irodsext.mdtemplate.service", "org.irods.jargon.irodsext.mdtemplate.service.api" })
+@ComponentScan(basePackages = { "org.irods.jargon.irodsext.mdtemplate", "org.irods.jargon.irodsext.mdtemplate.api" })
 public class Swagger2SpringBoot implements CommandLineRunner {
 
     @Override
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiException.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiException.java
similarity index 61%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiException.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiException.java
index 49d300a..7e40b8d 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiException.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiException.java
@@ -1,6 +1,6 @@
-package org.irods.jargon.irodsext.mdtemplate.service.api;
+package org.irods.jargon.irodsext.mdtemplate.api;
 
-@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.service.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
+@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
 
 public class ApiException extends Exception{
     private int code;
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiOriginFilter.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiOriginFilter.java
similarity index 85%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiOriginFilter.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiOriginFilter.java
index 65fb651..7aa76c3 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiOriginFilter.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiOriginFilter.java
@@ -1,11 +1,11 @@
-package org.irods.jargon.irodsext.mdtemplate.service.api;
+package org.irods.jargon.irodsext.mdtemplate.api;
 
 import java.io.IOException;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.service.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
+@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
 
 public class ApiOriginFilter implements javax.servlet.Filter {
     @Override
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiResponseMessage.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiResponseMessage.java
similarity index 90%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiResponseMessage.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiResponseMessage.java
index 50bf0f4..daf14f5 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/ApiResponseMessage.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/ApiResponseMessage.java
@@ -1,8 +1,8 @@
-package org.irods.jargon.irodsext.mdtemplate.service.api;
+package org.irods.jargon.irodsext.mdtemplate.api;
 
 import javax.xml.bind.annotation.XmlTransient;
 
-@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.service.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
+@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
 
 @javax.xml.bind.annotation.XmlRootElement
 public class ApiResponseMessage {
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/NotFoundException.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/NotFoundException.java
similarity index 63%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/NotFoundException.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/api/NotFoundException.java
index c12ca4e..c7eccfd 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/NotFoundException.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/NotFoundException.java
@@ -1,6 +1,6 @@
-package org.irods.jargon.irodsext.mdtemplate.service.api;
+package org.irods.jargon.irodsext.mdtemplate.api;
 
-@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.service.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
+@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
 
 public class NotFoundException extends ApiException {
     private int code;
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/TemplateApi.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/TemplateApi.java
similarity index 88%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/TemplateApi.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/api/TemplateApi.java
index 93c9502..841289b 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/TemplateApi.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/TemplateApi.java
@@ -3,12 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package org.irods.jargon.irodsext.mdtemplate.service.api;
+package org.irods.jargon.irodsext.mdtemplate.api;
 
 import io.swagger.annotations.*;
 
-import org.irods.jargon.irodsext.mdtemplate.service.model.Element;
-import org.irods.jargon.irodsext.mdtemplate.service.model.Template;
 import org.irods.jargon.metadatatemplate.model.MDTemplate;
 import org.irods.jargon.metadatatemplate.model.MDTemplateElement;
 import org.springframework.http.ResponseEntity;
@@ -25,7 +23,7 @@
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 import java.util.List;
-@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.service.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2018-07-17T12:26:03.800Z")
 
 @Api(value = "template", description = "the template API")
 public interface TemplateApi {
@@ -36,7 +34,7 @@ public interface TemplateApi {
     @RequestMapping(value = "/template/{guid}/element",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.POST)
-    ResponseEntity<Void> addElement(@ApiParam(value = "unique object task name",required=true) @PathVariable("guid") Integer guid,@ApiParam(value = "Created Element object" ,required=true )  @Valid @RequestBody Element body);
+    ResponseEntity<Void> addElement(@ApiParam(value = "unique object task name",required=true) @PathVariable("guid") Integer guid,@ApiParam(value = "Created Element object" ,required=true )  @Valid @RequestBody MDTemplateElement body);
 
 
     @ApiOperation(value = "Add a new Template", nickname = "addTemplate", notes = "Adding a new metadata template", tags={ "Templates", })
@@ -46,7 +44,7 @@ public interface TemplateApi {
         produces = { "application/xml", "application/json" }, 
         consumes = { "application/json", "application/xml" },
         method = RequestMethod.POST)
-    ResponseEntity<Void> addTemplate(@ApiParam(value = "Template object that needs to be added to the system" ,required=true )  @Valid @RequestBody Template templateData);
+    ResponseEntity<Void> addTemplate(@ApiParam(value = "Template object that needs to be added to the system" ,required=true )  @Valid @RequestBody MDTemplate templateData);
 
 
     @ApiOperation(value = "Delete Element", nickname = "deleteElement", notes = "", tags={ "Element", })
@@ -76,12 +74,12 @@ public interface TemplateApi {
     @RequestMapping(value = "/template/{guid}",
         produces = { "application/json" }, 
         method = RequestMethod.GET)
-    ResponseEntity<MDTemplate> findTemplateByGuid(@ApiParam(value = "pass an a guid to get template",required=true) @PathVariable("guid") String guid);
+    ResponseEntity<Void> findTemplateByGuid(@ApiParam(value = "pass an a guid to get template",required=true) @PathVariable("guid") String guid);
 
 
-    @ApiOperation(value = "Get Element by guid", nickname = "getElementByGuid", notes = "", response = Element.class, tags={ "Element", })
+    @ApiOperation(value = "Get Element by guid", nickname = "getElementByGuid", notes = "", response = MDTemplateElement.class, tags={ "Element", })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = Element.class),
+        @ApiResponse(code = 200, message = "successful operation", response = MDTemplateElement.class),
         @ApiResponse(code = 400, message = "Invalid guid supplied"),
         @ApiResponse(code = 404, message = "Element not found") })
     @RequestMapping(value = "/template/{guid}/element/{guid}",
@@ -97,7 +95,7 @@ public interface TemplateApi {
     @RequestMapping(value = "/template/{guid}/element/{guid}",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.PUT)
-    ResponseEntity<Void> updateElement(@ApiParam(value = "Element that need to be updated",required=true) @PathVariable("guid") Integer guid,@ApiParam(value = "Updated Element object" ,required=true )  @Valid @RequestBody Element body);
+    ResponseEntity<Void> updateElement(@ApiParam(value = "Element that need to be updated",required=true) @PathVariable("guid") Integer guid,@ApiParam(value = "Updated Element object" ,required=true )  @Valid @RequestBody MDTemplateElement body);
 
 
     @ApiOperation(value = "Update an existing Template", nickname = "updateTemplate", notes = "", tags={ "Templates", })
@@ -109,6 +107,6 @@ public interface TemplateApi {
         produces = { "application/xml", "application/json" }, 
         consumes = { "application/json", "application/xml" },
         method = RequestMethod.PUT)
-    ResponseEntity<Void> updateTemplate(@ApiParam(value = "Template object that needs to be added to the system" ,required=true )  @Valid @RequestBody Template templateData);
+    ResponseEntity<Void> updateTemplate(@ApiParam(value = "Template object that needs to be added to the system" ,required=true )  @Valid @RequestBody MDTemplate templateData);
 
 }
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/TemplateApiController.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/TemplateApiController.java
similarity index 50%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/TemplateApiController.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/api/TemplateApiController.java
index 3420d62..4d70b0a 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/api/TemplateApiController.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/api/TemplateApiController.java
@@ -1,14 +1,13 @@
-package org.irods.jargon.irodsext.mdtemplate.service.api;
+package org.irods.jargon.irodsext.mdtemplate.api;
+
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;
 
-import org.irods.jargon.irodsext.mdtemplate.service.model.Element;
-import org.irods.jargon.irodsext.mdtemplate.service.model.Template;
-import org.irods.jargon.irodsext.mdtemplate.service.service.IrodsSampleTemplateService;
+import org.irods.jargon.metadatatemplate.model.MDTemplate;
+import org.irods.jargon.metadatatemplate.model.MDTemplateElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -24,8 +23,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.List;
-import java.util.UUID;
-@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.service.codegen.languages.SpringCodegen", date = "2018-07-16T19:45:57.555Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2018-07-17T12:26:03.800Z")
 
 @Controller
 public class TemplateApiController implements TemplateApi {
@@ -35,9 +33,6 @@ public class TemplateApiController implements TemplateApi {
     private final ObjectMapper objectMapper;
 
     private final HttpServletRequest request;
-    
-    @Autowired
-    public IrodsSampleTemplateService irodsSampleTemplateService;
 
     @org.springframework.beans.factory.annotation.Autowired
     public TemplateApiController(ObjectMapper objectMapper, HttpServletRequest request) {
@@ -45,70 +40,64 @@ public TemplateApiController(ObjectMapper objectMapper, HttpServletRequest reque
         this.request = request;
     }
 
-    public ResponseEntity<Void> addElement(@ApiParam(value = "unique object task name",required=true) @PathVariable("guid") Integer guid,@ApiParam(value = "Created Element object" ,required=true )  @Valid @RequestBody Element body) {
+    public ResponseEntity<Void> addElement(@ApiParam(value = "unique object task name",required=true) @PathVariable("guid") Integer guid,@ApiParam(value = "Created Element object" ,required=true )  @Valid @RequestBody MDTemplateElement body) {
         String accept = request.getHeader("Accept");
         return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    public ResponseEntity<Void> addTemplate(@ApiParam(value = "Template object that needs to be added to the system" ,required=true )  @Valid @RequestBody Template templateData) {
+    public ResponseEntity<Void> addTemplate(@ApiParam(value = "Template object that needs to be added to the system" ,required=true )  @Valid @RequestBody MDTemplate templateData) {
         String accept = request.getHeader("Accept");
         return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    public ResponseEntity<Void> deleteElement(@ApiParam(value = "The Element that needs to be deleted",required=true) @PathVariable("guid") Integer guid) {
+    @Override
+	public ResponseEntity<Void> deleteElement(@ApiParam(value = "The Element that needs to be deleted",required=true) @PathVariable("guid") Integer guid) {
         String accept = request.getHeader("Accept");
         return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    public ResponseEntity<Void> deleteTemplate(@ApiParam(value = "template guid to delete",required=true) @PathVariable("guid") Long guid) {
+    @Override
+	public ResponseEntity<Void> deleteTemplate(@ApiParam(value = "template guid to delete",required=true) @PathVariable("guid") Long guid) {
         String accept = request.getHeader("Accept");
         return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    public ResponseEntity<Template> findTemplateByGuid(@ApiParam(value = "pass an a guid to get template",required=true) @PathVariable("guid") String guid) {
-    	String accept = request.getHeader("Accept");
-        Template template = new Template();
-       
-         // MdTemplate mdTemplate =  adstractMetadataService.findTemplateByUUID(UUID.fromString(guid));
-          //guid = "9f089439-9665-4464-929b-2704d765b588";
-          template = irodsSampleTemplateService.findTemplateByUUID (UUID.fromString(guid));
-       
-        System.out.println("Template Searched is :: " + template.getTemplateName());
-        if(template != null)
-          return ResponseEntity.accepted().body(template);
-        else
-          return new ResponseEntity<Template>(HttpStatus.NOT_IMPLEMENTED);
+    @Override
+	public ResponseEntity<Void> findTemplateByGuid(@ApiParam(value = "pass an a guid to get template",required=true) @PathVariable("guid") String guid) {
+        String accept = request.getHeader("Accept");
+        return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    public ResponseEntity<Element> getElementByGuid(@ApiParam(value = "The Element that needs to be fetched. ",required=true) @PathVariable("guid") Integer guid) {
+    @Override
+	public ResponseEntity<MDTemplateElement> getElementByGuid(@ApiParam(value = "The Element that needs to be fetched. ",required=true) @PathVariable("guid") Integer guid) {
         String accept = request.getHeader("Accept");
         if (accept != null && accept.contains("application/xml")) {
             try {
-                return new ResponseEntity<Element>(objectMapper.readValue("<Element>  <id>123456789</id>  <attribute>aeiou</attribute>  <defaultValue>aeiou</defaultValue>  <attributeUnit>aeiou</attributeUnit>  <type>aeiou</type>  <required>true</required>  <options>aeiou</options>  <access_type>aeiou</access_type>  <validationExp>aeiou</validationExp>  <guid>aeiou</guid></Element>", Element.class), HttpStatus.NOT_IMPLEMENTED);
+                return new ResponseEntity<MDTemplateElement>(objectMapper.readValue("<MDTemplateElement>  <guid>aeiou</guid>  <name>aeiou</name>  <defaultValue>aeiou</defaultValue>  <type>aeiou</type>  <required>true</required>  <options>aeiou</options>  <access_type>aeiou</access_type>  <validationExp>aeiou</validationExp>  <cardinalityMin>123</cardinalityMin>  <cardinalityMax>123</cardinalityMax></MDTemplateElement>", MDTemplateElement.class), HttpStatus.NOT_IMPLEMENTED);
             } catch (IOException e) {
                 log.error("Couldn't serialize response for content type application/xml", e);
-                return new ResponseEntity<Element>(HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<MDTemplateElement>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
 
         if (accept != null && accept.contains("application/json")) {
             try {
-                return new ResponseEntity<Element>(objectMapper.readValue("{  \"attributeUnit\" : \"attributeUnit\",  \"access_type\" : \"access_type\",  \"defaultValue\" : \"defaultValue\",  \"elements\" : [ null, null ],  \"options\" : \"options\",  \"guid\" : \"guid\",  \"id\" : 1,  \"attribute\" : \"attribute\",  \"type\" : \"type\",  \"required\" : true,  \"validationExp\" : \"validationExp\"}", Element.class), HttpStatus.NOT_IMPLEMENTED);
+                return new ResponseEntity<MDTemplateElement>(objectMapper.readValue("{  \"access_type\" : \"access_type\",  \"defaultValue\" : \"defaultValue\",  \"elements\" : [ null, null ],  \"name\" : \"name\",  \"options\" : \"options\",  \"guid\" : \"guid\",  \"cardinalityMin\" : 1,  \"cardinalityMax\" : 5,  \"type\" : \"type\",  \"required\" : true,  \"validationExp\" : \"validationExp\"}", MDTemplateElement.class), HttpStatus.NOT_IMPLEMENTED);
             } catch (IOException e) {
                 log.error("Couldn't serialize response for content type application/json", e);
-                return new ResponseEntity<Element>(HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<MDTemplateElement>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
 
-        return new ResponseEntity<Element>(HttpStatus.NOT_IMPLEMENTED);
+        return new ResponseEntity<MDTemplateElement>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    public ResponseEntity<Void> updateElement(@ApiParam(value = "Element that need to be updated",required=true) @PathVariable("guid") Integer guid,@ApiParam(value = "Updated Element object" ,required=true )  @Valid @RequestBody Element body) {
+    public ResponseEntity<Void> updateElement(@ApiParam(value = "Element that need to be updated",required=true) @PathVariable("guid") Integer guid,@ApiParam(value = "Updated Element object" ,required=true )  @Valid @RequestBody MDTemplateElement body) {
         String accept = request.getHeader("Accept");
         return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    public ResponseEntity<Void> updateTemplate(@ApiParam(value = "Template object that needs to be added to the system" ,required=true )  @Valid @RequestBody Template templateData) {
+    public ResponseEntity<Void> updateTemplate(@ApiParam(value = "Template object that needs to be added to the system" ,required=true )  @Valid @RequestBody MDTemplate templateData) {
         String accept = request.getHeader("Accept");
         return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
     }
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/CustomInstantDeserializer.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/CustomInstantDeserializer.java
similarity index 99%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/CustomInstantDeserializer.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/CustomInstantDeserializer.java
index 42ad830..be97825 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/CustomInstantDeserializer.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/CustomInstantDeserializer.java
@@ -1,4 +1,4 @@
-package org.irods.jargon.irodsext.mdtemplate.service.configuration;
+package org.irods.jargon.irodsext.mdtemplate.configuration;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonTokenId;
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/HomeController.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/HomeController.java
similarity index 84%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/HomeController.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/HomeController.java
index 6e77772..6db8351 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/HomeController.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/HomeController.java
@@ -1,4 +1,4 @@
-package org.irods.jargon.irodsext.mdtemplate.service.configuration;
+package org.irods.jargon.irodsext.mdtemplate.configuration;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/JacksonConfiguration.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/JacksonConfiguration.java
similarity index 92%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/JacksonConfiguration.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/JacksonConfiguration.java
index d7b9c88..cde6b4b 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/JacksonConfiguration.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/JacksonConfiguration.java
@@ -1,4 +1,4 @@
-package org.irods.jargon.irodsext.mdtemplate.service.configuration;
+package org.irods.jargon.irodsext.mdtemplate.configuration;
 
 import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/SwaggerDocumentationConfig.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/SwaggerDocumentationConfig.java
similarity index 78%
rename from src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/SwaggerDocumentationConfig.java
rename to src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/SwaggerDocumentationConfig.java
index 901dde4..2690353 100644
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/configuration/SwaggerDocumentationConfig.java
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/configuration/SwaggerDocumentationConfig.java
@@ -1,9 +1,7 @@
-package org.irods.jargon.irodsext.mdtemplate.service.configuration;
+package org.irods.jargon.irodsext.mdtemplate.configuration;
 
-import org.irods.jargon.irodsext.mdtemplate.service.service.IrodsSampleTemplateService;
-import org.irods.jargon.irodsext.mdtemplate.service.service.IrodsSampleTemplateServiceImpl;
-import org.irods.jargon.metadatatemplate.AbstractMetadataService;
-import org.irodsext.mdtemplate.services.IrodsExtMetadataServiceImpl;
+import org.irods.jargon.irodsext.mdtemplate.service.IrodsSampleTemplateService;
+import org.irods.jargon.irodsext.mdtemplate.service.IrodsSampleTemplateServiceImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -15,7 +13,7 @@
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 
-@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.service.codegen.languages.SpringCodegen", date = "2018-07-05T20:33:48.236Z")
+@javax.annotation.Generated(value = "org.irods.jargon.irodsext.mdtemplate.codegen.languages.SpringCodegen", date = "2018-07-05T20:33:48.236Z")
 
 @Configuration
 @ComponentScan({ "org.irodsext.mdtemplate", "org.irods.jargon.metadatatemplate" })
@@ -37,7 +35,7 @@ ApiInfo apiInfo() {
     public Docket customImplementation(){
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()
-                    .apis(RequestHandlerSelectors.basePackage("org.irods.jargon.irodsext.mdtemplate.service.api"))
+                    .apis(RequestHandlerSelectors.basePackage("org.irods.jargon.irodsext.mdtemplate.api"))
                     .build()
                 .directModelSubstitute(org.threeten.bp.LocalDate.class, java.sql.Date.class)
                 .directModelSubstitute(org.threeten.bp.OffsetDateTime.class, java.util.Date.class)
@@ -49,8 +47,10 @@ public IrodsSampleTemplateService irodsSampleTemplateService(){
     	return new IrodsSampleTemplateServiceImpl();
     }
 
+    /*
     @Bean
     public AbstractMetadataService abstractMetadataService(){
     	return new IrodsExtMetadataServiceImpl();
     }
+    */
 }
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/IrodsSampleTemplateService.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/IrodsSampleTemplateService.java
new file mode 100644
index 0000000..6b85c7c
--- /dev/null
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/IrodsSampleTemplateService.java
@@ -0,0 +1,11 @@
+package org.irods.jargon.irodsext.mdtemplate.service;
+
+import java.util.UUID;
+
+import org.irods.jargon.metadatatemplate.model.MDTemplate;
+
+public interface IrodsSampleTemplateService {
+
+		public MDTemplate findTemplateByUUID(UUID uuid);
+	
+}
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/IrodsSampleTemplateServiceImpl.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/IrodsSampleTemplateServiceImpl.java
new file mode 100644
index 0000000..83c3395
--- /dev/null
+++ b/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/IrodsSampleTemplateServiceImpl.java
@@ -0,0 +1,46 @@
+package org.irods.jargon.irodsext.mdtemplate.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.irods.jargon.metadatatemplate.model.MDTemplate;
+import org.irods.jargon.metadatatemplate.model.MDTemplateElement;
+
+
+
+public class IrodsSampleTemplateServiceImpl implements IrodsSampleTemplateService {
+
+	@Override
+	public MDTemplate findTemplateByUUID(UUID uuid) {
+		MDTemplate MDTemplate = new MDTemplate();
+		
+		MDTemplate.setTemplateName("MDTemplate1");
+		MDTemplate.setAccessType("OWNER");
+		MDTemplate.setDescription("This is Test MDTemplate");
+		MDTemplateElement MDTemplateElement = new MDTemplateElement();
+		MDTemplateElement.setName("Location");
+		MDTemplateElement.setDefaultValue("New York");
+		
+		MDTemplateElement childMetadataCity = new MDTemplateElement();
+		childMetadataCity.setName("city");
+		childMetadataCity.setDefaultValue("NYC");
+		MDTemplateElement childMetadataCounty = new MDTemplateElement();
+		childMetadataCounty.setName("County");
+		childMetadataCounty.setDefaultValue("Bronxs");
+		
+		List<MDTemplateElement> MetadataMDTemplateElementsList = new ArrayList();
+		MetadataMDTemplateElementsList.add(childMetadataCity);
+		MetadataMDTemplateElementsList.add(childMetadataCounty);
+		MDTemplateElement.setElements(MetadataMDTemplateElementsList);
+		
+		List<MDTemplateElement> sList = new ArrayList();
+		sList.add(MDTemplateElement);
+		MDTemplate.setElements(sList);
+		
+		return MDTemplate;
+	}
+
+	
+
+}
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/service/IrodsSampleTemplateService.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/service/IrodsSampleTemplateService.java
deleted file mode 100644
index 76bb205..0000000
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/service/IrodsSampleTemplateService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.irods.jargon.irodsext.mdtemplate.service.service;
-
-import java.util.UUID;
-
-import org.irods.jargon.irodsext.mdtemplate.service.model.Template;
-
-public interface IrodsSampleTemplateService {
-
-		public Template findTemplateByUUID(UUID uuid);
-	
-}
diff --git a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/service/IrodsSampleTemplateServiceImpl.java b/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/service/IrodsSampleTemplateServiceImpl.java
deleted file mode 100644
index f3fe900..0000000
--- a/src/main/java/org/irods/jargon/irodsext/mdtemplate/service/service/IrodsSampleTemplateServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.irods.jargon.irodsext.mdtemplate.service.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import org.irods.jargon.core.query.MetaDataAndDomainData.MetadataDomain;
-import org.irods.jargon.irodsext.mdtemplate.service.model.Element;
-import org.irods.jargon.irodsext.mdtemplate.service.model.Template;
-
-
-
-public class IrodsSampleTemplateServiceImpl implements IrodsSampleTemplateService {
-
-	@Override
-	public Template findTemplateByUUID(UUID uuid) {
-		Template template = new Template();
-		
-		template.setTemplateName("Template1");
-		template.setAccessType("OWNER");
-		template.setDescription("This is Test Template");
-		Element element = new Element();
-		element.setAttribute("Location");
-		element.setDefaultValue("New York");
-		
-		Element childMetadataCity = new Element();
-		childMetadataCity.setAttribute("city");
-		childMetadataCity.setDefaultValue("NYC");
-		Element childMetadataCounty = new Element();
-		childMetadataCounty.setAttribute("County");
-		childMetadataCounty.setDefaultValue("Bronxs");
-		
-		List<Element> MetadataElementsList = new ArrayList();
-		MetadataElementsList.add(childMetadataCity);
-		MetadataElementsList.add(childMetadataCounty);
-		element.setElements(MetadataElementsList);
-		
-		List<Element> templateElementsList = new ArrayList();
-		templateElementsList.add(element);
-		template.setElements(templateElementsList);
-		
-		return template;
-	}
-
-}