diff --git a/client/app/shared/dropzone/dropzone.component.ts b/client/app/shared/dropzone/dropzone.component.ts
index 69dcfad2..4f523c40 100644
--- a/client/app/shared/dropzone/dropzone.component.ts
+++ b/client/app/shared/dropzone/dropzone.component.ts
@@ -1,7 +1,6 @@
-import { Component, ElementRef, ViewChild } from '@angular/core';
+import { Component, OnInit, ElementRef, ViewChild } from '@angular/core';
 import { BaseComponent } from '../base.component';
 import { itemSchema } from '../UIConfig.model';
-import { SkillManagerService } from '../../step-builder/step-input-area/skill-manager.service';
 
 declare var Dropzone: any;
 Dropzone.autoDiscover = false;
@@ -10,56 +9,19 @@ Dropzone.autoDiscover = false;
   templateUrl: './dropzone.component.html',
   styleUrls: ['./dropzone.component.scss']
 })
-export class DropzoneComponent extends BaseComponent {
+export class DropzoneComponent extends BaseComponent implements OnInit {
   @ViewChild('dropzone') dropzoneContainer;
   labelConfig: itemSchema = new itemSchema();
-  width: string;
-  height: string;
-  constructor(private elementRef: ElementRef, private skillManager: SkillManagerService) {
+  constructor(private elementRef: ElementRef){
     super();
   }
   ngOnInit() {
-    super.ngOnInit();
-    var self = this;
     this.labelConfig.rendererProperties.text = this.compConfig.label;
     this.labelConfig.rendererProperties.type = 'ElementHeading';
-    if (this.compConfig.dim !== undefined) {
-      this.height = `${this.compConfig.dim['height']}`;
-      this.width = `${this.compConfig.dim['width']}`;
-    } else {
-      this.height = `200px`;
-      this.width = `100%`;
-    }
     let dropzone = new Dropzone(this.dropzoneContainer.nativeElement, {
       url: "/api/file",
-      init: function () {
-        self.dropzoneInitializer(this);
-      }
+      dictDefaultMessage: this.compConfig.rendererProperties.placeHolder
     });
-
-  }
-
-  dropzoneInitializer(dropzone) {
-    var self = this;
-    var reader = new FileReader();
-    dropzone.on("addedfile", function (file) { //To be Changed from 'addedfile' to 'success' when file starts getting stored on server;
-      //Read File when it is Dropped
-      reader.readAsText(file, 'UTF8');
-    });
-    reader.onload = function (e) {
-      //Update Dependencies when contents have been read;
-      var droppedFile = JSON.parse(e.target['result']);
-      self.updateDependencies(droppedFile);
-    }
-  }
-
-  updateDependencies(droppedFile) {
-    var dependants = this.compConfig.dependants;
-    for (let i = 0; i < dependants.length; i++) {
-      let dependantModelReference = dependants[i]['modelReference'];
-      let dependantRule = dependants[i]['rule'];
-      this.skillManager[dependantRule](droppedFile, dependantModelReference);
-    }
   }
 
 }
diff --git a/client/app/step-builder/step-builder/step-builder.component.css b/client/app/step-builder/step-builder/step-builder.component.css
new file mode 100644
index 00000000..8e6854fc
--- /dev/null
+++ b/client/app/step-builder/step-builder/step-builder.component.css
@@ -0,0 +1,3 @@
+.row {
+  margin: 10px;
+}
diff --git a/client/app/step-builder/step-builder/step-builder.component.html b/client/app/step-builder/step-builder/step-builder.component.html
index 41bb4bca..67576e87 100644
--- a/client/app/step-builder/step-builder/step-builder.component.html
+++ b/client/app/step-builder/step-builder/step-builder.component.html
@@ -1,41 +1,40 @@
-<nav class="navbar navbar-default" id="header">
+<nav class="navbar navbar-default">
   <div class="container-fluid">
+    <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
       <div class="row">
-        <div class="col-md-10">
-          <div class="row">
-            <h4><strong>STEP 1</strong>&nbsp;Move the range G5:H6 to the range D5:E6</h4>
-          </div>
-          <div class="row">
-            <span class="tag tag-primary"><span>Task ID:&nbsp;</span> SKL16.XL.04.01.03.T1  </span>&nbsp;<span class="tag tagFontNormal tag-primary"><span >Skill:&nbsp;</span> Move Cell Contents</span> &nbsp; <span class="tag tag-primary"><span>Template:&nbsp;</span> Move Cell Range </span>
-          </div>
-        </div>
-        <div class="col-md-2">
-          <ul class="nav navbar-nav navbar-right">
-            <li><button class="btn btn-inverse pull-right" (click)="onClose()">Close</button></li>
-          </ul>
-        </div>
+        <h4><strong>STEP 1</strong>&nbsp;Move the range G5:H6 to the range D5:E6</h4>
+      </div>
+      <div class="row">
+        <span class="tag tagFontNormal tag-primary"><span>Task ID:&nbsp;</span> SKL16.XL.04.01.03.T1  </span>&nbsp;<span class="tag tagFontNormal tag-primary"><span >Skill:&nbsp;</span> Move Cell Contents</span> &nbsp; <span class="tag tagFontNormal tag-primary"><span>Template:&nbsp;</span> Move Cell Range </span>
       </div>
     </div>
-  </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse">
+      <ul class="nav navbar-nav navbar-right">
+        <li><button class="btn btn-inverse">Close</button></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
 </nav>
-<div class="body-container">
-  <div id="body">
-    <div class="row">
-      <div class="col-lg-12 col-md-12">
-        <app-step-input-area [stepConfig]="uiConfig" (viewChanged)="setSelectedView($event.viewNumber)" [selectedView]="selectedView"></app-step-input-area>
-      </div>
+<div class="container">
+  <div class="row">
+    <div class="col-md-12">
+      <button (click)="fetchConfig()" class="btn btn-default btn-block">Fetch UI</button>
     </div>
   </div>
+  <div class="row">
+    <app-step-input-area [stepConfig]="uiConfig"></app-step-input-area>
+  </div>
 </div>
-<div id="footer">
+<div class="row" id="footer">
   <div class="col-md-12">
-    <button class="btn btn-inverse">Preview Step</button>
-    <button class="btn btn-inverse">Save</button>
+    <button class="btn btn-primary">Preview Step</button>
+    <button class="btn btn-primary">Save</button>
     <div class="pull-right">
-      <button class="btn btn-inverse" (click)="setSelectedView(selectedView-1)" [disabled]="selectedView == 1">Previous</button>
-      <button class="btn btn-inverse" *ngIf="selectedView < uiConfig.views.length" (click)="setSelectedView(selectedView+1)">Next</button>
-      <button class="btn btn-inverse" *ngIf="selectedView == uiConfig.views.length">Finish</button>
+      <button class="btn btn-primary">Previous</button>
+      <button class="btn btn-primary">Next</button>
     </div>
   </div>
 </div>
diff --git a/package.json b/package.json
index 98a46e49..eb30ce20 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "@angular/platform-browser": "^2.3.1",
     "@angular/platform-browser-dynamic": "^2.3.1",
     "@angular/router": "^3.3.1",
-    "angular2-jwt": "^0.1.28",
     "animate.css": "3.5.1",
     "awesome-bootstrap-checkbox": "1.0.0-alpha.4",
     "bcryptjs": "^2.3.0",
@@ -31,15 +30,13 @@
     "bootstrap": "4.0.0-alpha.5",
     "bootstrap-select": "1.11.2",
     "core-js": "^2.4.1",
-    "dropzone": "^4.3.0",
     "express": "^4.14.1",
     "font-awesome": "4.7.0",
     "glyphicons-halflings": "1.9.0",
     "jquery": "^3.1.1",
-    "jquery-slimscroll": "^1.3.8",
-    "jsonwebtoken": "^7.3.0",
+    "jsonwebtoken": "^7.0.0",
     "mongoose": "^4.8.4",
-    "mongoose-unique-validator": "^1.0.4",
+    "mongoose-unique-validator": "^1.0.2",
     "ng2-bootstrap": "^1.3.3",
     "pace": "git://github.com/HubSpot/pace.git#v0.7.7",
     "passport": "^0.3.2",
@@ -50,6 +47,7 @@
     "validator": "^5.2.0",
     "webpack": "^2.2.1",
     "widgster": "0.0.3",
+    "xmldom": "^0.1.27",
     "zone.js": "^0.7.2"
   },
   "devDependencies": {
diff --git a/server/config/config.js b/server/config/config.js
index e15f85bd..cc81dfc8 100644
--- a/server/config/config.js
+++ b/server/config/config.js
@@ -1,6 +1,9 @@
 const path = require('path');
 const serverRootPath = path.normalize(__dirname + '/..');
-const env = process.env.NODE_ENV || 'development';
+const fileStorePath = serverRootPath + '/fileStore/';
+const xmlFolderPath = fileStorePath + 'XMLs/';
+const env = process.env.NODE_ENV || 'local';
+
 
 const config = {
     local: {
@@ -9,17 +12,23 @@ const config = {
         },
         port: process.env.port || 3000,
         db: {
-            url: 'mongodb://localhost:27017/testDB',
+            url: 'ds137360.mlab.com:37360/ss_testdb',
             dbOptions: {
                 db: {
                     native_parser: true
                 },
                 server: {
                     poolsize: 10
-                }
+                },
+                user: 'task_builder',
+                pass: 'task_builder'
             }
         },
-        root: serverRootPath
+        root: serverRootPath,
+        fileStore: {
+            baseURL: fileStorePath,
+            xmlFolderPath: xmlFolderPath
+        }
     },
     development: {
         app: {
@@ -39,7 +48,11 @@ const config = {
                 pass: 'task_builder'
             }
         },
-        root: serverRootPath
+        root: serverRootPath,
+        fileStore: {
+            baseURL: fileStorePath,
+            xmlFolderPath: xmlFolderPath
+        }
     },
     production: {
         app: {
@@ -47,7 +60,7 @@ const config = {
         },
         port: process.env.port || 3000,
         db: {
-            url: 'mongodb://localhost:27017/testDB',
+            url: 'ds113650.mlab.com:13650/sims-task-bullder',
             dbOptions: {
                 db: {
                     native_parser: true
@@ -55,11 +68,15 @@ const config = {
                 server: {
                     poolsize: 20
                 },
-                user: 'test',
-                pass: 'test'
+                user: 'task_builder',
+                pass: 'task_builder'
             }
         },
-        root: serverRootPath
+        root: serverRootPath,
+        fileStore: {
+            baseURL: fileStorePath,
+            xmlFolderPath: xmlFolderPath
+        }
     }
 };
 
diff --git a/server/config/db.js b/server/config/db.js
index 5adcf575..f6273051 100644
--- a/server/config/db.js
+++ b/server/config/db.js
@@ -6,17 +6,18 @@ try {
 }
 catch(error) {
     console.log(error);
+    return;
 }
 
 const db = mongoose.connection;
 
 db.on('connected', function () {
-    console.log('Mongoose default connection open');
+    console.log('Mongoose default connection established.');
 });
 
 // When the connection is disconnected
 db.on('disconnected', function () {
-    console.log('Mongoose default connection disconnected');
+    console.log('Mongoose default connection ended.');
 });
 
 exports.db = db;
diff --git a/server/controllers/db.controller.js b/server/controllers/db.controller.js
index 161bbd87..d55b5f6b 100644
--- a/server/controllers/db.controller.js
+++ b/server/controllers/db.controller.js
@@ -1,50 +1,57 @@
 const skillConfigRepoModel = require('../models/skillConfigRepo.model').skill_config_repo;
-const taskStepUIModel = require('../models/taskStepUI.model').taskStepUIModel;
-
-module.exports.getUIConfigPath = function(templateId, callback) {
-    getFilePath(templateId, 'ui_config_path', callback);
-};
-
-module.exports.getSkillXMLPath = function(templateId, callback) {
-    getFilePath(templateId, 'skill_xml_path', callback);
-};
-
-module.exports.getIOMapPath = function(templateId, callback) {
-    getFilePath(templateId, 'io_map_path', callback);
-};
-
-module.exports.getSkillModelPath = function(templateId, callback) {
-    getFilePath(templateId, 'data_model_path', callback);
-};
-
-module.exports.getStepUIState = function(taskId, stepIndex, callback) {
-    let condition = {"task_id": taskId};
-    let jsonKey = "task_data.step_" + stepIndex;
-    let map = {"_id": false};
-    map[jsonKey] = true;
-
-    taskStepUIModel.getStepUI(condition, map, (error, data) => {
-        callback(data, error);
-    });
-};
-
-module.exports.saveStepUIState = function(taskId, stepIndex, stepUIData, callback) {
-    let updateCriteria = {"task_id": taskId};
-    let jsonKey = "task_data.step_" + stepIndex;
-    let updateData = { $set: {}};
-    updateData.$set[jsonKey] = stepUIData;
-    let options = { upsert: true };
-
-    taskStepUIModel.updateStepUIData(updateCriteria, updateData, options, (error, success) => {
-        callback(error, success);
-    });
-};
-
-function getFilePath(templateId, fileKey, callback) {
-    let filterCriteria = {"_id": false};
-    filterCriteria[fileKey] = true;
-
-    skillConfigRepoModel.getFilePath({"template_id": templateId}, filterCriteria, (error, data) => {
-        callback(data[0][fileKey], error);
-    });
-}
\ No newline at end of file
+const uiTaskStepModel = require('../models/uiTaskStep.model').uiTaskStepModel;
+
+class DatabaseController {
+    
+    getUIConfigPath(templateId, callback) {
+        DatabaseController.getFilePath(templateId, 'ui_config_path', callback);
+    }
+
+    getSkillXMLPath(templateId, callback) {
+        DatabaseController.getFilePath(templateId, 'skill_xml_path', callback);
+    }
+
+    getIOMapPath(templateId, callback) {
+        DatabaseController.getFilePath(templateId, 'io_map_path', callback);
+    }
+
+    getSkillModelPath(templateId, callback) {
+        DatabaseController.getFilePath(templateId, 'data_model_path', callback);
+    }
+
+    getStepUIState(taskId, stepIndex, callback) {
+        let condition = {"task_id": taskId};
+        let jsonKey = "task_data.step_" + stepIndex;
+        let map = {"_id": false};
+        map[jsonKey] = true;
+
+        uiTaskStepModel.getStepUI(condition, map, (error, data) => {
+            let stepId = "step_" + stepIndex;
+            let stepUIState = data[0]._doc.task_data[stepId];
+            callback(error, stepUIState);
+        });
+    }
+
+    saveStepUIState(taskId, stepIndex, stepUIData, callback) {
+        let updateCriteria = {"task_id": taskId};
+        let jsonKey = "task_data.step_" + stepIndex;
+        let updateData = { $set: {}};
+        updateData.$set[jsonKey] = stepUIData;
+        let options = { upsert: true };
+
+        uiTaskStepModel.updateStepUIData(updateCriteria, updateData, options, (error, success) => {
+            callback(error, success);
+        });
+    }
+
+    static getFilePath(templateId, fileKey, callback) {
+        let filterCriteria = {"_id": false};
+        filterCriteria[fileKey] = true;
+
+        skillConfigRepoModel.getFilePath({"template_id": templateId}, filterCriteria, (error, data) => {
+            callback(data[0][fileKey], error);
+        });
+    }
+}
+
+module.exports = new DatabaseController();
\ No newline at end of file
diff --git a/server/controllers/filestore.controller.js b/server/controllers/filestore.controller.js
index fa09a7b6..866f05d2 100644
--- a/server/controllers/filestore.controller.js
+++ b/server/controllers/filestore.controller.js
@@ -1,27 +1,112 @@
 const path = require('path');
 const config = require('../config/config');
 const fs = require('fs');
+const multer = require('multer');
+const mkdirp = require('mkdirp');
 
-module.exports.getUIConfig = function(filepath, callback) {
-    readFromFileStore(filepath, callback);
-};
+class FileStoreController {
 
-module.exports.getSkillXML = function(filepath, callback) {
-    readFromFileStore(filepath, callback);
-};
+    getUIConfig(filepath, callback) {
+        FileStoreController.readFromFileStore(filepath, callback);
+    }
 
-module.exports.getIOMap = function(filepath, callback) {
-    readFromFileStore(filepath, callback);
-};
+    getSkillXML(filepath, callback) {
+        FileStoreController.readFromFileStore(filepath, callback);
+    }
 
-module.exports.getSkillModel = function(filepath, callback) {
-    readFromFileStore(filepath, callback);
-};
+    getIOMap(filepath, callback) {
+        FileStoreController.readFromFileStore(filepath, callback);
+    }
 
-function readFromFileStore(filepath, callback) {
-    let absolutePath = config.root + "/" + filepath;
+    getSkillModel(filepath, callback) {
+        FileStoreController.readFromFileStore(filepath, callback);
+    }
 
-    fs.readFile(absolutePath, 'utf8', function (err, data) {
-        callback(err, data);
-    });
-};
\ No newline at end of file
+    saveStepXML(taskId, stepIndex, OutputXML, callback){
+        //HARDCODING task ID here
+        var taskId = "EXP16.WD.02.03.01.t1";
+        let filePath = FileStoreController.getTaskFolderPath(taskId) + "stepxmls/";
+        let fileName = stepIndex + ".xml";
+        
+        FileStoreController.saveToFileStore(filePath, fileName, OutputXML, callback);
+    }
+
+    saveResourceFile(templateId, taskId, stepIndex, fileName) {
+        let filePath = FileStoreController.getTaskFolderPath(taskId) + "Assets/step-" + stepIndex;
+
+        return FileStoreController.uploadFileHandler(filePath);
+    }
+
+    static readFromFileStore(filepath, callback) {
+        let absolutePath = config.fileStore.baseURL + filepath;
+
+        fs.readFile(absolutePath, 'utf8', function (err, data) {
+            callback(err, data);
+        });
+    }
+
+    static uploadFileHandler(filePath) {
+        let storage = multer.diskStorage({
+            destination: function (req, file, callback) {
+                let destinationFilePath = filePath;
+
+                FileStoreController.createFolder(destinationFilePath, (error) => {
+                    callback(null, destinationFilePath);
+                });
+            },
+            filename: function (req, file, callback) {
+                callback(null, file.originalname);
+            }
+        });
+        let upload = multer({ storage: storage });
+        return upload.fields([{ name: 'Browse', maxCount: 1 }]);
+    }
+
+    static createFolder(folderPath, callback){
+        mkdirp(folderPath, (error) => {
+            callback(error);
+        });
+    }
+
+    static getTaskFolderPath(taskId) {
+        let taskIdArr = taskId.toLowerCase().split('.');
+        if(taskIdArr[0].length > 3) {
+            taskIdArr[0] = taskIdArr[0].slice(0, taskIdArr[0].length - 2);
+        }
+        
+        let taskIdPath = "";
+        let taskFolder = "";
+
+        for(let i = 0; i < taskIdArr.length; i++) {
+            if(i < taskIdArr.length - 3) {
+                taskIdPath += taskIdArr[i] + "/";
+            }
+            else if (i == taskIdArr.length - 1){
+                taskFolder += taskIdArr[i] + "/";
+            }
+            else {
+                taskFolder += taskIdArr[i] + ".";
+            }
+        }
+        
+        let filePath = config.fileStore.baseURL + config.fileStore.xmlFolderRelativePath + taskIdPath + taskFolder;
+        return filePath;
+    }
+
+    static saveToFileStore(filepath, fileName, file, callback) {
+        
+        //Create Folder if already don't exist
+        FileStoreController.createFolder(filepath, (error) => {
+            if(!error){
+                //Saving XML
+                fs.writeFile(filepath + fileName, file, (err) => {
+                    callback(err);
+                });
+            }
+            else
+                 callback(err);
+        });
+    }
+}
+
+module.exports = new FileStoreController();
diff --git a/server/controllers/skill.controller.js b/server/controllers/skill.controller.js
index c5c12344..a8aa9db7 100644
--- a/server/controllers/skill.controller.js
+++ b/server/controllers/skill.controller.js
@@ -1,10 +1,25 @@
-const uiHandler = require('../modules/skill/uiHandler');
-const dbFilestoreMgr = require('../modules/skill/dbFilestoreMgr');
+const UIHandler = require('../modules/skill/uiHandler');
+const DBFilestoreMgr = require('../modules/skill/dbFilestoreMgr');
+const XmlGenerationHandler = require('../modules/skill/xmlGenerationHandler');
 
-module.exports.getUIConfig = function(templateId, data, callback) {
-    return uiHandler.getUIConfig(templateId, data, callback);
+module.exports = class SkillController {
+    
+    constructor() {
+        this.uiHandlerObj = new UIHandler();
+        this.dbFilestoreMgrObj = new DBFilestoreMgr();
+    }
+    
+    getUIConfig(templateId, data, callback) {
+        return this.uiHandlerObj.getUIConfig(templateId, data, callback);
+    }
+
+    saveStepUIState(taskId, stepIndex, stepUIData, callback) {
+        this.dbFilestoreMgrObj.saveStepUIState(taskId, stepIndex, stepUIData, callback);
+    }
+
+    generateXML(templateId, taskId, stepIdx, callback) {
+        xmlGenerationHandlerObj.generateStepXML(templateId, taskId, stepIdx, callback);
+    }
 };
 
-module.exports.saveStepUIState = function(taskId, stepIndex, stepUIData, callback) {
-    dbFilestoreMgr.saveStepUIState(taskId, stepIndex, stepUIData, callback);
-};
\ No newline at end of file
+
diff --git a/server/fileStore/skills/xl/MoveCellContent/skill.xml b/server/fileStore/skills/xl/MoveCellContent/skill.xml
index 8e79659d..7cf40fd3 100644
--- a/server/fileStore/skills/xl/MoveCellContent/skill.xml
+++ b/server/fileStore/skills/xl/MoveCellContent/skill.xml
@@ -41,10 +41,10 @@
 						<attr name="IMAGE_JSON" userDefined="true"/>
 					</initialattrs>
 					<finalattributesets>
-						<attributeset name="set1">
+						<attributeset name="set-1">
 							<attr name="SELECTED_CELLS" userDefined="true"/>
 						</attributeset>
-						<attributeset name="set3">
+						<attributeset name="set-3">
 							<attr name="SEL_DRAG_CELL" userDefined="true"/>
 						</attributeset>
 					</finalattributesets>
diff --git a/server/libs/skills/common/baseSkill.js b/server/libs/skills/common/baseSkill.js
index e69de29b..7c20f5cb 100644
--- a/server/libs/skills/common/baseSkill.js
+++ b/server/libs/skills/common/baseSkill.js
@@ -0,0 +1,7 @@
+module.exports = class baseSkill{
+    //This is the function of the TaskBar tooltip image path
+    createTooltipImagePath(paramValueArr){
+      
+      return paramValueArr[0].path;
+    }
+}
\ No newline at end of file
diff --git a/server/libs/skills/xl/common/xlSkill.js b/server/libs/skills/xl/common/xlSkill.js
index e69de29b..70091e77 100644
--- a/server/libs/skills/xl/common/xlSkill.js
+++ b/server/libs/skills/xl/common/xlSkill.js
@@ -0,0 +1,25 @@
+const baseSkill = require("../../common/baseSkill");
+
+//Excel based Common Functionality goes here 
+module.exports = class ExcelBaseSkill extends baseSkill{
+//this function moved to  Base Excel Skill 
+// Sheet number still hardcoded, should be generated by the component handler
+    createImageJson (paramValueArr){
+
+        var finalObject = {};
+        finalObject['folderPath'] = paramValueArr[0].path;
+        var sheetArr = []
+
+        for(iterator = 0 ; iterator < paramValueArr[0].length; ++iterator){
+            sheetArr[iterator] = {};
+            sheetArr[iterator]['sheetNo'] = 1;
+            sheetArr[iterator]['gridImg'] = paramValueArr[0][iterator].gridImage.name;
+            sheetArr[iterator]['rowImg'] = paramValueArr[0][iterator].rowImage.name;
+            sheetArr[iterator]['colImg'] = paramValueArr[0][iterator].cellImage.name;
+            sheetArr[iterator]['cellImg'] = paramValueArr[0][iterator].columnImage.name;
+        }
+        finalObject['sheetImages'] = sheetArr;
+        finalObject = JSON.stringify(finalObject);
+        return finalObject;
+    }
+}
diff --git a/server/libs/skills/xl/moveCellContent/moveCellContent.js b/server/libs/skills/xl/moveCellContent/moveCellContent.js
index 0119953f..3400c3cc 100644
--- a/server/libs/skills/xl/moveCellContent/moveCellContent.js
+++ b/server/libs/skills/xl/moveCellContent/moveCellContent.js
@@ -1,104 +1,82 @@
 
-  //init DOC JSON 
-  exports.createJsonPath = function(valueParam){
-     
-    return valueParam[0].path;
-  }
-
-
-  exports.getSelectedCell = function(paramValueArr){
-    
-    return paramValueArr[0];
+(function(){
 
-  }
-
-  exports.getSelDragCell = function(paramValueArr){
-    //requires sheet name using init doc json
-    
-    var finalObject = {};
-    finalObject["sheetNo"] = 1;
-    finalObject["startRange"] = paramValueArr[1];
-    finalObject["endRange"] = paramValueArr[2];
-    finalObject = JSON.stringify(finalObject);
-    return finalObject;
+  const ExcelBaseSkill = require("../common/xlSkill");
 
-  }
+  class moveCellContent extends ExcelBaseSkill{
+    //init DOC JSON 
+    createJsonPath(valueParam){
 
+      return valueParam[0].path;
+    }
 
-  exports.createTooltipImagePath  = function(paramValueArr){
-     
-    return paramValueArr[0].path;
-
-  }
-
+    getSelectedCell(paramValueArr){
+      
+      return paramValueArr[0];
+    }
 
+    getSelDragCell(paramValueArr){
+      //requires sheet name using init doc json
+      
+      var finalObject = {};
+      finalObject["sheetNo"] = 1;
+      finalObject["startRange"] = paramValueArr[1];
+      finalObject["endRange"] = paramValueArr[2];
+      finalObject = JSON.stringify(finalObject);
+      return finalObject;
 
-  exports.createImageJson = function(paramValueArr){
+    }
     
-    var finalObject = {};
-    finalObject['folderPath'] = paramValueArr[0].path;
-    var sheetArr = []
-
-      for(iterator = 0 ; iterator < paramValueArr[0].length; ++iterator){
-        sheetArr[iterator] = {};
-        sheetArr[iterator]['sheetNo'] = '1';
-        sheetArr[iterator]['gridImg'] = paramValueArr[0][iterator].gridImage.name;
-        sheetArr[iterator]['rowImg'] = paramValueArr[0][iterator].rowImage.name;
-        sheetArr[iterator]['colImg'] = paramValueArr[0][iterator].cellImage.name;
-        sheetArr[iterator]['cellImg'] = paramValueArr[0][iterator].columnImage.name;
+    createHighlightJson (paramValueArr){
+      
+      // requires sheet number using Init Doc json
+      var finalObject = {};
+      finalObject["sheetNo"] = 1;
+      finalObject["range"] = paramValueArr[1];
+      finalObject = JSON.stringify(finalObject);
+      return finalObject;
     }
-    finalObject['sheetImages'] = sheetArr;
-    finalObject = JSON.stringify(finalObject);
-    return finalObject;
-  }
-
 
-  exports.createHighlightJson  =  function(paramValueArr){
-     
-    // requires sheet number using Init Doc json
-    var finalObject = {};
-    finalObject["sheetNo"] = 1;
-    finalObject["range"] = paramValueArr[1];
-    finalObject = JSON.stringify(finalObject);
-    return finalObject;
-  }
 
+    createSheetCellData (paramValueArr){
+      
+      var finalObject = {};
+      finalObject["sheetNo"] = 1;
+      finalObject["dataJSONPath"] = paramValueArr[1].path;
+      
+      finalObject  =  JSON.stringify(finalObject);
+      return finalObject;
 
-  exports.createSheetCellData =function(paramValueArr){
-     
-    var finalObject = {};
-    finalObject["sheetNo"] = 1;
-    finalObject["dataJSONPath"] = paramValueArr[1].path;
-    
-    finalObject  =  JSON.stringify(finalObject);
-    return finalObject;
-
-  }
+    }
 
-    exports.getSelectedCellFinal = function(paramValueArr){
-    
-    finalArray = [];
-    
-    var valuearray = paramValueArr[0].split(":");
-    valuearray[0].trim();
-    valuearray[1].trim();
-    
-    var c1 = valuearray[0].toUpperCase().charAt(0);
-    var c2 = valuearray[1].toUpperCase().charAt(0);
-    var r1 = parseInt(valuearray[0].substring(1, valuearray[0].length));
-    var r2 = parseInt(valuearray[1].substring(1, valuearray[0].length));
-    
-    finalArray.push(valuearray[0]);
-    
-      for(iterator = 0 ; iterator <= c2.charCodeAt(0)-c1.charCodeAt(0); ++iterator){
-        for( index = 0; index < r2-r1 ; ++index) {
-          if(iterator != 0 || index != 0)
-            finalArray.push(c1+r1 +":" + (String.fromCharCode(c1.charCodeAt(0) + iterator))+(r1+index));
-        }
+    getSelectedCellFinal (paramValueArr){
+      
+      var finalArray = [];
+      
+      var valuearray = paramValueArr[0].split(":");
+      valuearray[0].trim();
+      valuearray[1].trim();
+      
+      var c1 = valuearray[0].toUpperCase().charAt(0);
+      var c2 = valuearray[1].toUpperCase().charAt(0);
+      var r1 = parseInt(valuearray[0].substring(1, valuearray[0].length));
+      var r2 = parseInt(valuearray[1].substring(1, valuearray[0].length));
+      
+      finalArray.push(valuearray[0]);
+      
+        for(var iterator = 0 ; iterator <= c2.charCodeAt(0)-c1.charCodeAt(0); ++iterator){
+          for(var index = 0; index < r2-r1 ; ++index) {
+            if(iterator != 0 || index != 0)
+              finalArray.push(c1+r1 +":" + (String.fromCharCode(c1.charCodeAt(0) + iterator))+(r1+index));
+          }
+
+      }
+      
+      return finalArray;
 
     }
-    finalArray = JSON.stringify(finalArray);
     
-    return finalArray;
-
   }
+  module.exports = new moveCellContent();
+
+})(typeof module.exports === 'undefined'? this['myModule']={}: module);
diff --git a/server/models/taskStepUI.model.js b/server/models/uiTaskStep.model.js
similarity index 75%
rename from server/models/taskStepUI.model.js
rename to server/models/uiTaskStep.model.js
index 963f9989..7294c6bc 100644
--- a/server/models/taskStepUI.model.js
+++ b/server/models/uiTaskStep.model.js
@@ -1,12 +1,12 @@
 const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
 
-const taskStepUISchema = new Schema({
+const uiTaskStepSchema = new Schema({
     task_id: "string",
     ui_task_data: Schema.Types.Mixed
 }, {collection: 'ui_task_step'});
 
-taskStepUISchema.statics = {
+uiTaskStepSchema.statics = {
     getStepUI: function(condition, map, callback) {
         this.find(condition, map, callback);
     },
@@ -15,8 +15,8 @@ taskStepUISchema.statics = {
     }
 };
 
-let taskStepUIModel = mongoose.model('ui_task_step', taskStepUISchema);
+let uiTaskStepModel = mongoose.model('ui_task_step', uiTaskStepSchema);
 
 module.exports = {
-    taskStepUIModel
+    uiTaskStepModel
 };
\ No newline at end of file
diff --git a/server/modules/skill/dbFilestoreMgr.js b/server/modules/skill/dbFilestoreMgr.js
index cfe2b467..07dce782 100644
--- a/server/modules/skill/dbFilestoreMgr.js
+++ b/server/modules/skill/dbFilestoreMgr.js
@@ -1,58 +1,60 @@
 const dbController = require('../../controllers/db.controller');
 const fileStoreController = require('../../controllers/filestore.controller');
 
-module.exports.getUIConfig = function(templateId, callback) {
-    dbController.getUIConfigPath(templateId, (filePath, error) => {
-        if(!error) {
-            fileStoreController.getUIConfig(filePath, callback);
-        }
-        else {
-            callback(error);
-        }
-    });
-};
+module.exports = class DatabaseFileStoreManager {
+    getUIConfig(templateId, callback) {
+        dbController.getUIConfigPath(templateId, (filePath, error) => {
+            if(!error) {
+                fileStoreController.getUIConfig(filePath, callback);
+            }
+            else {
+                callback(error);
+            }
+        });
+    }
 
-module.exports.getSkillXML = function(templateId, callback) {
-    dbController.getSkillXMLPath(templateId, (filePath, error) => {
-        if(!error) {
-            fileStoreController.getSkillXML(filePath, callback);
-        }
-        else {
-            callback(error);
-        }
-    });
-};
+    getSkillXML(templateId, callback) {
+        dbController.getSkillXMLPath(templateId, (filePath, error) => {
+            if(!error) {
+                fileStoreController.getSkillXML(filePath, callback);
+            }
+            else {
+                callback(error);
+            }
+        });
+    }
 
-module.exports.getIOMap = function(templateId, callback) {
-    dbController.getIOMapPath(templateId, (filePath, error) => {
-        if(!error) {
-            fileStoreController.getIOMap(filePath, callback);
-        }
-        else {
-            callback(error);
-        }
-    });
-};
+    getIOMap(templateId, callback) {
+        dbController.getIOMapPath(templateId, (filePath, error) => {
+            if(!error) {
+                fileStoreController.getIOMap(filePath, callback);
+            }
+            else {
+                callback(error);
+            }
+        });
+    }
 
-module.exports.getSkillModel = function(templateId, callback) {
-    dbController.getSkillModelPath(templateId, (filePath, error) => {
-        if(!error) {
-            fileStoreController.getSkillModel(filePath, callback);
-        }
-        else {
-            callback(error);
-        }
-    });
-};
+    getSkillModel(templateId, callback) {
+        dbController.getSkillModelPath(templateId, (filePath, error) => {
+            if(!error) {
+                fileStoreController.getSkillModel(filePath, callback);
+            }
+            else {
+                callback(error);
+            }
+        });
+    }
 
-module.exports.getStepUIState = function(taskId, stepIndex, callback) {
-    dbController.getStepUIState(taskId, stepIndex, (data, error) => {
-        callback(data, error);
-    });
-};
+    getStepUIState(taskId, stepIndex, callback) {
+        dbController.getStepUIState(taskId, stepIndex, (data, error) => {
+            callback(data, error);
+        });
+    }
 
-module.exports.saveStepUIState = function(taskId, stepIndex, stepUIData, callback) {
-    dbController.saveStepUIState(taskId, stepIndex, stepUIData, (data, error) => {
-        callback(data, error);
-    });
-};
\ No newline at end of file
+    saveStepUIState(taskId, stepIndex, stepUIData, callback) {
+        dbController.saveStepUIState(taskId, stepIndex, stepUIData, (data, error) => {
+            callback(data, error);
+        });
+    }
+}
\ No newline at end of file
diff --git a/server/modules/skill/ioTranslator.js b/server/modules/skill/ioTranslator.js
index 3a8553f0..51f34adf 100644
--- a/server/modules/skill/ioTranslator.js
+++ b/server/modules/skill/ioTranslator.js
@@ -1,76 +1,79 @@
 
+class IOTranslator{
 
-//common function for getting the param array for the passed array of params
-getEvaluatedParams = function(paramArr , stepUIState){
-  
-  
-  var evalexp = "stepUIState.model.";  
-  var finalArray = [];
+  //common function for getting the param array for the passed array of params
+  getEvaluatedParams (paramArr , stepUIState){
 
-  for(var iterator = 0; iterator < paramArr.length; ++iterator ){
-    finalArray[iterator] = eval(evalexp + paramArr[iterator]);
-    
+    var evalexp = "stepUIState.model.";  
+    var finalArray = [];
+
+    for(var iterator = 0; iterator < paramArr.length; ++iterator ){
+      finalArray[iterator] = eval(evalexp + paramArr[iterator]);
+      
+    }
+    return finalArray;
   }
-  return finalArray;
-}
 
-evaluateFromFunc = function(functionName, paramsArr, skillobject){
+  evaluateFromFunc (attrName, functionName, paramsArr, skillobject){
 
-    if(skillobject[functionName]){
-      var finalValue = skillobject[functionName](paramsArr);
-    }
-    else{
-      console.log("function not defined for the attribute");
-    }
+      if(skillobject[functionName]){
+        var finalValue = skillobject[functionName](paramsArr);
+      }
+      else{
+        console.log("function not defined for the attribute : " + attrName);
+      }
 
-    return finalValue;
-}
+      return finalValue;
+  }
 
 
-evaluateAttribute = function(attrName, attrObject, stepUIState, skillobject){
+  evaluateAttribute (attrName, attrObject, stepUIState, skillobject){
 
-  var evaluatedParams = [];
-  var attrObjectValue = "";
-  //the attr params currentky contains the string values , the LOC below converts it into values from the Step UI Json 
-  evaluatedParams = getEvaluatedParams(attrObject.params, stepUIState);
+    var evaluatedParams = [];
+    var attrObjectValue = "";
+    //the attr params currentky contains the string values , the LOC below converts it into values from the Step UI Json 
+    evaluatedParams = this.getEvaluatedParams(attrObject.params, stepUIState);
 
-  if(attrObject["function-name"] == null){
-    // assign directly
-    attrObjectValue = evaluatedParams[0];
-  }
-  else{
-    // call the function type execution for the evaluation
-    attrObjectValue = evaluateFromFunc(attrObject["function-name"], evaluatedParams, skillobject);
+    if(attrObject["function-name"] == null){
+      // assign directly
+      attrObjectValue = evaluatedParams[0];
+    }
+    else{
+      // call the function type execution for the evaluation
+      attrObjectValue = this.evaluateFromFunc(attrName, attrObject["function-name"], evaluatedParams, skillobject);
+    }
+    return attrObjectValue
   }
-  return attrObjectValue
-}
 
 
 
-readIOMap = function(iomap, stepUIState, skillobject){
-    
-    for(stateNum in iomap.states){
-      var stateObj = iomap.states[stateNum];
-      for(componentNum in stateObj.components){
-          var componentObj = iomap.states[stateNum].components[componentNum];
-          for(attrType in componentObj){
-            var attrTypeObj  = iomap.states[stateNum].components[componentNum][attrType]
-            for(attrSet in attrTypeObj){
-              var attrSetObj = iomap.states[stateNum].components[componentNum][attrType][attrSet];
-              for(attrName in attrSetObj){
-                
-                attrSetObj[attrName] = evaluateAttribute(attrName, attrSetObj[attrName], stepUIState, skillobject);
-           
-             }
+  readIOMap(iomap, stepUIState, skillobject){
+      
+      for(var stateNum in iomap.states){
+        var stateObj = iomap.states[stateNum];
+        for(var componentNum in stateObj.components){
+            var componentObj = iomap.states[stateNum].components[componentNum];
+            for(var attrType in componentObj){
+              var attrTypeObj  = iomap.states[stateNum].components[componentNum][attrType]
+              for(var attrSet in attrTypeObj){
+                var attrSetObj = iomap.states[stateNum].components[componentNum][attrType][attrSet];
+                for(var attrName in attrSetObj){
+                  
+                  attrSetObj[attrName] = this.evaluateAttribute(attrName, attrSetObj[attrName], stepUIState, skillobject);
+            
+              }
+              }
             }
-          }
-      }
+        }
+    }
+    // return the IOMap
+    return iomap;
+  }
+
+  getAttrValueMap (iomap, stepUIState, skillobject){
+    //move out
+    return this.readIOMap(iomap, stepUIState, skillobject);
   }
-  // return the IOMap
-  return iomap;
 }
 
-exports.translateMap = function(iomap, stepUIState, skillobject){
-  //move out
-  return readIOMap(iomap, stepUIState, skillobject);
-}
\ No newline at end of file
+module.exports = new IOTranslator();
\ No newline at end of file
diff --git a/server/modules/skill/skillFactory.js b/server/modules/skill/skillFactory.js
index e69de29b..e7c5ad4e 100644
--- a/server/modules/skill/skillFactory.js
+++ b/server/modules/skill/skillFactory.js
@@ -0,0 +1,29 @@
+// this map should contain the key-value reference for the templateID-skillObjectFile and this file would generate the instance for the SkillObjectfile
+
+class skillFactory{
+    
+    constructor(){
+        this.SkillObjectMap = {
+            "movecellcontent":"/xl/moveCellContent/moveCellContent"
+        }
+    }
+
+    identifySkill(templateId){
+        if(this.SkillObjectMap[templateId]){
+            return this.SkillObjectMap[templateId];
+        }
+        else{
+            console.log("No Skill Exists in the map for the templateId : "+ templateId);
+        }
+
+    }
+
+    getSkillObjectRef (templateId){
+        var skillFile = this.identifySkill(templateId);
+        var skillRef = require("../../libs/skills" + skillFile);
+        return skillRef;
+    }
+
+}
+
+module.exports = new skillFactory();
diff --git a/server/modules/skill/uiHandler.js b/server/modules/skill/uiHandler.js
index 1e48790e..dd4078e7 100644
--- a/server/modules/skill/uiHandler.js
+++ b/server/modules/skill/uiHandler.js
@@ -1,5 +1,12 @@
-const dbFilestoreMgr = require('./dbFilestoreMgr');
+const DatabaseFileStoreManager = require('./dbFilestoreMgr');
 
-module.exports.getUIConfig = function(templateId, data, callback) {
-    return dbFilestoreMgr.getUIConfig(templateId, callback);
-};
\ No newline at end of file
+module.exports = class UIHandler {
+    
+    constructor() {
+        this.dbFilestoreMgr = new DatabaseFileStoreManager();
+    }
+
+    getUIConfig(templateId, data, callback) {
+        return this.dbFilestoreMgr.getUIConfig(templateId, callback);
+    }
+}
\ No newline at end of file
diff --git a/server/modules/skill/xmlGenerationHandler.js b/server/modules/skill/xmlGenerationHandler.js
index ac44a6c8..9b7b5593 100644
--- a/server/modules/skill/xmlGenerationHandler.js
+++ b/server/modules/skill/xmlGenerationHandler.js
@@ -3,46 +3,38 @@ const translator = require("./ioTranslator.js");
 const xmlGenerator = require("./xmlGenerator/Step.js");
 
 
-function identifySkill(templateId){
-    return {
-        "movecellcontent":"/xl/moveCellContent/moveCellContent"
-    }[templateId];
-}
-
-module.exports.generateStepXML = function(taskId, stepIndex, templateId, callback){
-
+module.exports.generateStepXML = function(templateId, taskId, stepIndex, skillRef, callback){
+    
     dbFilestoreMgr.getStepUIState(taskId, stepIndex, (stepUIState, error) => {
         if(!error){
             dbFilestoreMgr.getIOMap(templateId, (error, IOMapJson) => {
-                if(!error){
+                if(!error) {
 
                     //IO Translator
                     let IOMap = JSON.parse(IOMapJson);
-
-                    var identifiedSkill = identifySkill(templateId);
-                    var skillRef = require("../../libs/skills" + identifiedSkill);
-            
                     stepUIState = stepUIState[0]._doc.task_data['step_' + stepIndex];
-                    attrValueMap = translator.translateMap(IOMap, stepUIState, skillRef);
+                    let attrValueMap = translator.getAttrValueMap(IOMap, stepUIState, skillRef);
 
                     //XML GENERATION
                     dbFilestoreMgr.getSkillXML(templateId, (error, skillTemplate) => {
-                        if(!error){
+                        if(!error) {
                             let newStep = new xmlGenerator(skillTemplate, attrValueMap);
                             let OutputXML = newStep.stepGenerator();
-                            callback(error, OutputXML);
+
+                            //Saving Step XML in File Store
+                            dbFilestoreMgr.saveStepXML(taskId, stepIndex, OutputXML, callback);
                         }
                         else{
                             callback(error, skillTemplate);
                         }
                     });
                 }
-                else{
+                else {
                     callback(error, IOMapJson);
                 }
             });
         }
-        else{
+        else {
             callback(error, stepUIState);
         }
     });
diff --git a/server/modules/skill/xmlGenerator/Component.js b/server/modules/skill/xmlGenerator/Component.js
index 064bd547..61c52113 100644
--- a/server/modules/skill/xmlGenerator/Component.js
+++ b/server/modules/skill/xmlGenerator/Component.js
@@ -56,7 +56,7 @@ module.exports = class component {
     }
     function2(parentSet, XMLNode, jsonMap) {
         if (jsonMap && jsonMap[parentSet]) {
-            this.function1("defaultAttrs", XMLNode, jsonMap[parentSet]);
+            this.function1("default-attrs", XMLNode, jsonMap[parentSet]);
         }
     }
     function3(parentSet, XMLNode, jsonMap) {
diff --git a/server/routes/skill.routes.js b/server/routes/skill.routes.js
index d88a8e66..e53bcb5e 100644
--- a/server/routes/skill.routes.js
+++ b/server/routes/skill.routes.js
@@ -1,36 +1,22 @@
 const express = require('express');
 const router = express.Router();
-const skillController = require('../controllers/skill.controller');
+const SkillController = require('../controllers/skill.controller');
 //const dbFilestoreMgr = require('../modules/skill/dbFilestoreMgr');
+const skillController = new SkillController();
 
-router.get('/uiconfig/:templateId', (req, res) => {
+router.get('/uiconfig/:templateId/:taskId/:stepIndex', (req, res) => {
     let templateId = req.params.templateId;
-    let data = {};
-    skillController.getUIConfig(req.params.templateId, data, (error, data) => {
-        if(!error) {
-            res.json(JSON.parse(data));
-        }
-        else {
-            res.json(error);
-        }
-    });
-});
-/*
-router.get('/skillxml/:templateId', (req, res) => {
-    dbFilestoreMgr.getSkillXML(req.params.templateId, (error, data) => {
-        if(!error) {
-            res.json(data);
-        }
-        else {
-            res.json(error);
-        }
-    });
-});
+    let taskId = req.params.taskId;
+    let stepIndex = req.params.stepIndex;
 
-router.get('/iomap/:templateId', (req, res) => {
-    dbFilestoreMgr.getIOMap(req.params.templateId, (error, data) => {
+    let contentFilter = {
+        skillModelFlag: req.query.skillmodel || "true",
+        stepUIStateFlag: req.query.stepuistate || "true"
+    }
+    
+    skillController.getUIConfig(templateId, taskId, stepIndex, contentFilter, (error, data) => {
         if(!error) {
-            res.json(JSON.parse(data));
+            res.send(data);
         }
         else {
             res.json(error);
@@ -38,10 +24,11 @@ router.get('/iomap/:templateId', (req, res) => {
     });
 });
 
-router.get('/skillmodel/:templateId', (req, res) => {
-    dbFilestoreMgr.getSkillModel(req.params.templateId, (error, data) => {
+router.post('/stepuistate/:taskId/:stepIndex', (req, res) => {
+    let stepUIState = req.body.stepUIState;
+    skillController.saveStepUIState(req.params.taskId, req.params.stepIndex, stepUIState, (error, data) => {
         if(!error) {
-            res.json(JSON.parse(data));
+            res.json(data);
         }
         else {
             res.json(error);
@@ -49,26 +36,31 @@ router.get('/skillmodel/:templateId', (req, res) => {
     });
 });
 
-router.get('/stepui/:taskId/:stepIndex', (req, res) => {
-    dbFilestoreMgr.getStepUIState(req.params.taskId, req.params.stepIndex, (data, error) => {
-        if(!error) {
-            res.json(data);
-        }
-        else {
-            res.json(error);
+router.get('/xmlgeneration/:templateId/:taskid/:stepidx', (req, res) => {
+    let templateId = req.params.templateId;
+    let taskId = req.params.taskid;
+    let stepIdx = req.params.stepidx;
+    
+    skillController.generateXML(templateId, taskId, stepIdx, (error) => {
+        if (!error) {
+            res.end("success");
+        } else {
+            res.send(error);
         }
     });
 });
-*/
-router.post('/taskstep/:taskId/:stepIndex', (req, res) => {
-    let data = req.body.data;
-    skillController.saveStepUIState(req.params.taskId, req.params.stepIndex, data, (error, data) => {
-        if(!error) {
-            res.json(data);
-        }
-        else {
-            res.json(error);
+
+router.post("/uploadresource", (req, res) => {
+    //getting below data to be decided.
+    let templateId = "";
+    let taskId = "EXP16.WD.03.01.03.T1";
+    let stepIndex = 1;
+    let upload = skillController.saveResourceFile(templateId, taskId, stepIndex);
+    upload(req, res, (error) => {
+        if(error) {
+            res.end("Error uploading file.");
         }
+        res.end("File is uploaded");
     });
 });