diff --git a/build.gradle b/build.gradle
index eb2855b..8e0caaf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-core:2.12.4'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.4'
-    implementation 'org.yaml:snakeyaml:1.28'
+
 
     compile files(new File(buildDir, 'resources/resources')) {
         builtBy 'copyResources'
diff --git a/gradle.properties b/gradle.properties
index 8deb4ae..39c2d61 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-ideaVersion=2020.2
-projectVersion=1.2.0
+ideaVersion=2020.3
+projectVersion=1.3.0
 jetBrainsToken=invalid
 jetBrainsChannel=stable
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 622ab64..e12c11c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/jboss/tools/intellij/windup/cli/KantraCliParamBuilder.java b/src/main/java/org/jboss/tools/intellij/windup/cli/KantraCliParamBuilder.java
index a1114ba..4478ce3 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/cli/KantraCliParamBuilder.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/cli/KantraCliParamBuilder.java
@@ -4,14 +4,14 @@
 package org.jboss.tools.intellij.windup.cli;
 
 import com.google.common.collect.Lists;
-import org.jboss.tools.intellij.windup.model.KantraConfiguration;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 
 import java.util.List;
 import java.util.Map;
 
 public class KantraCliParamBuilder {
 
-    public static List<String> buildParams(KantraConfiguration config, String windupHome) {
+    public static List<String> buildParams(WindupConfiguration config, String windupHome) {
         List<String> params = Lists.newArrayList();
         Map<String, Object> options = config.getOptions();
         params.add("analyze");
diff --git a/src/main/java/org/jboss/tools/intellij/windup/cli/ProgressMonitor.java b/src/main/java/org/jboss/tools/intellij/windup/cli/ProgressMonitor.java
index 66ee9eb..03e43e1 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/cli/ProgressMonitor.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/cli/ProgressMonitor.java
@@ -23,6 +23,13 @@ public static class ProgressMessage {
         String task = "";
         int totalWork = 0;
         String value = "";
+
+        public ProgressMessage(String op, String task, int totalWork, String value) {
+            this.op = op;
+            this.task = task;
+            this.totalWork = totalWork;
+            this.value = value;
+        }
     }
 
     private IProgressListener progressListener;
@@ -35,6 +42,7 @@ public static class ProgressMessage {
     private boolean done = false;
 
     public ProgressMonitor(IProgressListener progressListener) {
+        System.out.println("(((((( This is the progressMonitor ))))))");
         this.progressListener = progressListener;
     }
 
@@ -163,7 +171,7 @@ public static JsonObject parseProgressMessage(String text) {
     }
 
     public static ProgressMessage parse(JsonObject json) throws JsonSyntaxException {
-        ProgressMonitor.ProgressMessage msg = new ProgressMonitor.ProgressMessage();
+        ProgressMonitor.ProgressMessage msg = new ProgressMonitor.ProgressMessage("","",0,"");
         msg.op = json.get("op").getAsString();
         if (json.has("value")) {
             msg.value = json.get("value").getAsString();
diff --git a/src/main/java/org/jboss/tools/intellij/windup/cli/RulesetParser.java b/src/main/java/org/jboss/tools/intellij/windup/cli/RulesetParser.java
index dfce936..a401a7a 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/cli/RulesetParser.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/cli/RulesetParser.java
@@ -3,40 +3,58 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import org.jboss.tools.intellij.windup.model.KantraConfiguration;
-
+import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class RulesetParser {
 
-    public static  List<KantraConfiguration.Ruleset> parseRuleset(String resultFilePath){
+    public static List<Ruleset> parseRuleset(String resultFilePath) {
+        Thread currentThread = Thread.currentThread();
+        ClassLoader originalClassLoader = currentThread.getContextClassLoader();
+        ClassLoader jacksonClassLoader = RulesetParser.class.getClassLoader();
 
         try {
+            currentThread.setContextClassLoader(jacksonClassLoader);
+
             ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
             File yamlFile = new File(resultFilePath);
-            objectMapper.findAndRegisterModules();
-            List<KantraConfiguration.Ruleset> ruleSets = objectMapper.readValue(yamlFile, new TypeReference<List<KantraConfiguration.Ruleset>>(){});
+            List<WindupConfiguration.Ruleset> ruleSets = objectMapper.readValue(
+                    yamlFile, new TypeReference<List<WindupConfiguration.Ruleset>>(){}
+            );
             if (ruleSets != null) {
-                ruleSets.removeIf(ruleset -> (ruleset.getViolations() == null || ruleset.getViolations().isEmpty() ) );
+                System.out.println("**************** In Parser --> Size of the ruleSet ***************" + ruleSets.size());
+                ruleSets.removeIf(ruleset -> (ruleset.getViolations() == null || ruleset.getViolations().isEmpty()));
                 return ruleSets;
             } else {
                 System.out.println("YAML file is empty or invalid.");
             }
         } catch (FileNotFoundException e) {
-            System.err.println("File not found: " + resultFilePath);
+            System.err.println("File not found : this is the problem ----> " + resultFilePath);
         } catch (Exception e) {
             System.err.println("Error parsing YAML: " + e.getMessage());
+        } finally {
+            currentThread.setContextClassLoader(originalClassLoader);
         }
         return null;
     }
-    public static void parseRulesetForKantraConfig (KantraConfiguration configuration){
+
+    public static void parseRulesetForKantraConfig (WindupConfiguration configuration){
         if (configuration.getOptions() != null){
             String outputLocation = configuration.getRulesetResultLocation();
             configuration.setRulesets(parseRuleset(outputLocation));
+
             if(configuration.getSummary() != null){
                 configuration.getSummary().setRulesets(parseRuleset(outputLocation));
+                parseIncidents(configuration.getRulesets(), configuration);
+                System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ size of the Incident $$$$$$$$$$$$$$$");
+                System.out.println(configuration.getSummary().getIssues().size());
+            }else {
+                System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ configuration.getSummary() != null  $$$$$$$$$$$$$$");
             }
 
         }else{
@@ -45,4 +63,41 @@ public static void parseRulesetForKantraConfig (KantraConfiguration configuratio
 
     }
 
+    public static void parseIncidents (List<WindupConfiguration.Ruleset> rulesets, WindupConfiguration configuration) {
+        if (rulesets != null){
+            for (WindupConfiguration.Ruleset ruleset: rulesets){
+                Map<String, Violation> violations = ruleset.getViolations();
+                if (violations != null ){
+                    for(WindupConfiguration.Violation violation : violations.values()){
+                        List<WindupConfiguration.Incident> incidents = violation.getIncidents();
+                        for (WindupConfiguration.Incident incident : incidents ) {
+                            incident.id = WindupConfiguration.generateUniqueId();
+                            incident.title = violation.getDescription().split("\n", 2)[0];
+                            ArrayList<String> inputs = (ArrayList<String>) configuration.getOptions().get("input");
+                            String input = inputs.get(0);
+                            String filePath =  incident.getUri();;
+                            String absolutePath = filePath.substring(filePath.indexOf("/source") + "/source".length());
+                            System.out.println("input:  " + input);
+                            System.out.println("File path of the incidents:  " + incident.file);
+                            System.out.println("Absolute path:  "+input + absolutePath);
+                            incident.file = input + absolutePath;
+                            incident.setUri(input + absolutePath);
+                            incident.effort = String.valueOf(violation.getEffort());
+                            incident.links = violation.getLinks();
+                            incident.category = violation.getCategory();
+                            if (configuration.getSummary().completeIssues.contains(incident.id)) {
+                                incident.complete = true;
+                            }
+                            incident.configuration = configuration;
+                            configuration.getSummary().incidents.add(incident);
+                        }
+                    }
+                }
+            }
+
+        }
+
+    }
+
+
 }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/cli/RunAnalysisCommandHandler.java b/src/main/java/org/jboss/tools/intellij/windup/cli/RunAnalysisCommandHandler.java
index 3fabc06..cbcbf21 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/cli/RunAnalysisCommandHandler.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/cli/RunAnalysisCommandHandler.java
@@ -44,8 +44,10 @@ public RunAnalysisCommandHandler(Project project,
         this.project = project;
         this.console = console;
         commandLine = new GeneralCommandLine();
-        commandLine.setExePath(executable);
+        commandLine.setExePath("kantra");
         commandLine.addParameters(params);
+        System.out.println("This is RunAnalysis Command handler............. constructor");
+        System.out.println(onComplete.toString());
         this.progressMonitor = new ProgressMonitor(this.createProgressListener(onComplete));
     }
 
@@ -81,6 +83,7 @@ public void run(final ProgressIndicator indicator) {
                     progressIndicator.setFraction(0.01);
                     handler.waitFor();
                     logTime();
+                    System.out.println("This is the end of the runAnlysis");
                 }
                 catch (Exception e) {
                     e.printStackTrace();
diff --git a/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliParamBuilder.java b/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliParamBuilder.java
deleted file mode 100644
index e34cff0..0000000
--- a/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliParamBuilder.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Red Hat. All rights reserved.
- *--------------------------------------------------------------------------------------------*/
-package org.jboss.tools.intellij.windup.cli;
-
-import com.google.common.collect.Lists;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
-
-import java.util.List;
-import java.util.Map;
-
-public class WindupCliParamBuilder {
-
-    public static List<String> buildParams(WindupConfiguration config, String windupHome) {
-        List<String> params = Lists.newArrayList();
-        Map<String, Object> options = config.getOptions();
-        params.add("--toolingMode");
-
-        // input
-        params.add("--input");
-        List<String> input = (List<String>)options.get("input");
-        input.forEach(path -> params.add("\"" + path + "\""));
-
-        // output
-        params.add("--output");
-        String output = (String)options.get("output");
-        params.add("\""+ output + "\"");
-
-        // source
-        List<String> source = (List<String>)options.get("source");
-        if (source != null && !source.isEmpty()) {
-            params.add("--source");
-            params.add(String.join(" ", source));
-        }
-
-        // target
-        List<String> target = (List<String>)options.get("target");
-        if (target == null || target.isEmpty()) {
-            target = Lists.newArrayList();
-            target.add("quarkus");
-        }
-        params.add("--target");
-
-        for (String aTarget : target) {
-            params.add(aTarget);
-        }
-
-        return params;
-    }
-}
diff --git a/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliProcessHandler.java b/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliProcessHandler.java
index 5a769e0..f41f233 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliProcessHandler.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliProcessHandler.java
@@ -8,6 +8,7 @@
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import org.jboss.tools.intellij.windup.explorer.actions.RunConfigurationAction;
@@ -25,6 +26,8 @@ public class WindupCliProcessHandler extends OSProcessHandler {
     private WindupConsole console;
     private boolean isCancelled = false;
 
+    int i = 0;
+
     public WindupCliProcessHandler(
             Process process,
             GeneralCommandLine commandLine,
@@ -40,6 +43,11 @@ public WindupCliProcessHandler(
 
     @Override
     public final void notifyTextAvailable(@NotNull String text, @NotNull final Key outputType) {
+
+     if(i <= 10){
+         System.out.println ("This is output from Kantra -----------------------> " + text);
+     }
+     i++;
         if (progressIndicator.isCanceled()) {
             destroyProcess();
             RunConfigurationAction.running = false;
@@ -61,6 +69,28 @@ else if (text.contains("Reading tags definitions")) {
         else if (text.contains("Finished provider load")) {
             progressIndicator.setText("Loading transformation paths...");
         }
+        else if (text.contains("rules parsed")) {
+            progressIndicator.setText("Parsing rules...");
+            progressIndicator.setFraction(0.10);
+        }
+        else if (text.contains("rule response received")) {
+            progressIndicator.setText("Running Analysis...");
+            progressIndicator.setFraction(0.25);
+        }
+        else if (text.contains("running dependency analysis")) {
+            progressIndicator.setText("Running Dependency Analysis...");
+            progressIndicator.setFraction(0.75);
+        }
+        else if (text.contains("generating static report")) {
+            progressIndicator.setText("Generating static report...");
+            progressIndicator.setFraction(0.95);
+        }
+        else if (text.contains("Static report created.")) {
+            System.out.println(text + "---------------------------------------: detected ");
+            ProgressMonitor.ProgressMessage msg = new ProgressMonitor.ProgressMessage("complete", "", 20, "");
+            progressMonitor.handleMessage(msg);
+            progressIndicator.setFraction(1);
+        }
         else if (text.contains(PROGRESS)) {
             JsonObject json = ProgressMonitor.parseProgressMessage(text);
             if (json != null) {
diff --git a/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliRunner.java b/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliRunner.java
index e73a3df..3a9b380 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliRunner.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliRunner.java
@@ -6,7 +6,6 @@
 import com.google.common.collect.Maps;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
 import org.apache.commons.exec.*;
 import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 
@@ -14,8 +13,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.jboss.tools.intellij.windup.cli.ProgressMonitor.PROGRESS;
-
 public class WindupCliRunner {
 
     private static final String JAVA_HOME = "JAVA_HOME";
@@ -30,14 +27,14 @@ public static void run(WindupConfiguration configuration,
                            ProgressMonitor progressMonitor,
                            CliListener listener) {
         String javaHome = "";
-        String windupCli = (String)configuration.getOptions().get("cli");
-        List<String> params = WindupCliParamBuilder.buildParams(configuration, windupCli);
+        String windupCli = "kantra";
+        List<String> params = KantraCliParamBuilder.buildParams(configuration, windupCli);
         WindupCliRunner.executeAnalysis(windupCli, javaHome, params, progressMonitor, listener);
     }
 
     private static void executeAnalysis(String cli, String javaHome, List<String> params, ProgressMonitor progressMonitor, CliListener listener) {
         System.out.println("execute CLI");
-        CommandLine cmdLine = CommandLine.parse(cli);
+        CommandLine cmdLine = CommandLine.parse("kantra");
         Map<String, String> env = Maps.newHashMap();
         for (Map.Entry<String, String> entry : System.getenv().entrySet()) {
             env.put(entry.getKey(), entry.getValue());
diff --git a/src/main/java/org/jboss/tools/intellij/windup/cli/WindupResultsParser.java b/src/main/java/org/jboss/tools/intellij/windup/cli/WindupResultsParser.java
deleted file mode 100644
index d6f6467..0000000
--- a/src/main/java/org/jboss/tools/intellij/windup/cli/WindupResultsParser.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Red Hat. All rights reserved.
- *--------------------------------------------------------------------------------------------*/
-package org.jboss.tools.intellij.windup.cli;
-
-import org.jboss.tools.intellij.windup.explorer.dialog.WindupNotifier;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.File;
-import java.net.FileNameMap;
-import java.net.URLConnection;
-
-public class WindupResultsParser {
-
-    public static void parseResults(WindupConfiguration configuration) {
-        WindupConfiguration.AnalysisResultsSummary summary = configuration.getSummary();
-        if (summary != null) {
-            Document doc = WindupResultsParser.openDocument(summary.outputLocation + File.separator + "results.xml");
-            if (doc != null) {
-                WindupResultsParser.parseReports(doc, configuration);
-                WindupResultsParser.parseHints(doc, configuration);
-                WindupResultsParser.parseClassifications(doc, configuration);
-            }
-            else {
-                System.out.println("Error parsing analysis results at: " + summary.outputLocation);
-            }
-        }
-    }
-
-    public static void loadAndPersistIDs(WindupConfiguration configuration, String outputLocation) {
-        String resultsLocation = outputLocation + File.separator + "results.xml";
-        try {
-            Document doc = WindupResultsParser.openDocument(resultsLocation);
-            if (doc != null) {
-                WindupResultsParser.setElementIDs(doc, "hint");
-                WindupResultsParser.setElementIDs(doc, "classification");
-                Transformer transformer = TransformerFactory.newInstance().newTransformer();
-                Result output = new StreamResult(new File(resultsLocation));
-                Source input = new DOMSource(doc);
-                transformer.transform(input, output);
-            } else {
-                System.out.println("Error loading analysis results at: " + outputLocation);
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static void setElementIDs(Document doc, String element) {
-        NodeList nodeList = doc.getElementsByTagName(element);
-        for (int temp = 0; temp < nodeList.getLength(); temp++) {
-            Node elementNode = nodeList.item(temp);
-            if (elementNode.getNodeType() == Node.ELEMENT_NODE) {
-                Element eElement = (Element) elementNode;
-                eElement.setAttribute("id", WindupConfiguration.generateUniqueId());
-                NodeList quickfixList = eElement.getElementsByTagName("quickfix");
-                for (int temp2 = 0; temp2 < quickfixList.getLength(); temp2++) {
-                    Node quickfixNode = quickfixList.item(temp2);
-                    if (quickfixNode.getNodeType() == Node.ELEMENT_NODE) {
-                        Element quickfixNode1 = (Element) quickfixNode;
-                        quickfixNode1.setAttribute("id", WindupConfiguration.generateUniqueId());
-                    }
-                }
-            }
-        }
-    }
-
-    private static Document openDocument(String location) {
-        try {
-            File inputFile = new File(location);
-            DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-            Document doc = dBuilder.parse(inputFile);
-            doc.getDocumentElement().normalize();
-            return doc;
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private static void parseReports(Document doc, WindupConfiguration configuration) {
-        NodeList reportLinks = doc.getElementsByTagName("report-link");
-        for (int temp = 0; temp < reportLinks.getLength(); temp++) {
-            Node reportLink = reportLinks.item(temp);
-            if (reportLink.getNodeType() == Node.ELEMENT_NODE) {
-                Element eElement = (Element) reportLink;
-                String inputFile = WindupResultsParser.getValue(eElement,"input-file");
-                String reportFile = WindupResultsParser.getValue(eElement,"report-file");
-                configuration.getSummary().reports.put(inputFile, reportFile);
-            }
-        }
-    }
-
-    private static void parseHints(Document doc, WindupConfiguration configuration) {
-        NodeList hintList = doc.getElementsByTagName("hint");
-        for (int temp = 0; temp < hintList.getLength(); temp++) {
-            Node hintNode = hintList.item(temp);
-            if (hintNode.getNodeType() == Node.ELEMENT_NODE) {
-                Element eElement = (Element) hintNode;
-                if (eElement.getParentNode().getNodeName() != "hints") continue;
-
-                String id = eElement.getAttribute("id");
-                if (configuration.getSummary().deletedIssues.contains(id)) {
-                    continue;
-                }
-
-                Hint hint = new Hint();
-                hint.id = eElement.getAttribute("id");
-                if ("".equals(hint.id)) {
-                    hint.id = WindupConfiguration.generateUniqueId();
-                    System.out.println("Windup results.xml not serialized with IDs");
-                    WindupNotifier.notifyError("Windup results.xml not serialized with IDs. Please try re-running the analysis with the latest version of the Windup plugin.");
-                }
-
-                if (configuration.getSummary().completeIssues.contains(id)) {
-                    hint.complete = true;
-                }
-
-                hint.configuration = configuration;
-                configuration.getSummary().hints.add(hint);
-
-                String complete = eElement.getAttribute("complete");
-                if (!"".equals(complete)) {
-                    hint.complete = true;
-                }
-
-                String title = WindupResultsParser.getValue(eElement,"title");
-                if (title != null) {
-                    hint.title = title;
-                }
-
-                String effort = WindupResultsParser.getValue(eElement,"effort");
-                if (effort != null) {
-                    hint.effort = effort;
-                }
-
-                String file = WindupResultsParser.getValue(eElement,"file");
-                if (file != null) {
-                    hint.file = file;
-                    String report = configuration.getSummary().reports.get(hint.file);
-                    if (report != null) {
-                        hint.report = report;
-                    }
-                }
-
-                String hintText = WindupResultsParser.getValue(eElement,"hint");
-                if (hintText != null) {
-                    hint.hint = hintText;
-                }
-
-                String category = WindupResultsParser.getValue(eElement,"categoryID");
-                if (category != null) {
-                    hint.category = category;
-                }
-
-                String ruleId = WindupResultsParser.getValue(eElement,"rule-id");
-                if (ruleId != null) {
-                    hint.ruleId = ruleId;
-                }
-
-                String length = WindupResultsParser.getValue(eElement,"length");
-                if (length != null) {
-                    hint.length = Integer.parseInt(length);
-                }
-
-                String lineNumber = WindupResultsParser.getValue(eElement,"line-number");
-                if (lineNumber != null) {
-                    hint.lineNumber = Integer.parseInt(lineNumber);
-                }
-
-                String column = WindupResultsParser.getValue(eElement,"column");
-                if (column != null) {
-                    hint.column = Integer.parseInt(column);
-                }
-
-                NodeList links = eElement.getElementsByTagName("link");
-                for (int temp1 = 0; temp1 < links.getLength(); temp1++) {
-                    Node linkNode = links.item(temp1);
-                    if (linkNode.getNodeType() == Node.ELEMENT_NODE) {
-                        Link link = new Link();
-                        hint.links.add(link);
-                        link.id = WindupConfiguration.generateUniqueId();
-                        String linkDescription = WindupResultsParser.getValue((Element)linkNode, "description");
-                        if (linkDescription != null) {
-                            link.title = linkDescription;
-                        }
-                        String url = WindupResultsParser.getValue((Element)linkNode, "url");
-                        if (url != null) {
-                            link.url = url;
-                        }
-                    }
-                }
-                WindupResultsParser.computeQuickfixes(hint, eElement);
-            }
-        }
-    }
-
-    private static void parseClassifications(Document doc, WindupConfiguration configuration) {
-        NodeList classificationList = doc.getElementsByTagName("classification");
-        for (int temp = 0; temp < classificationList.getLength(); temp++) {
-            Node classificationNode = classificationList.item(temp);
-            if (classificationNode.getNodeType() == Node.ELEMENT_NODE) {
-                Element eElement = (Element) classificationNode;
-                if (eElement.getParentNode().getNodeName() != "classifications") continue;
-
-                String id = eElement.getAttribute("id");
-                if (configuration.getSummary().deletedIssues.contains(id)) {
-                    continue;
-                }
-
-                Classification classification = new Classification();
-                classification.id = eElement.getAttribute("id");
-                if ("".equals(classification.id)) {
-                    classification.id = WindupConfiguration.generateUniqueId();
-                    System.out.println("Windup results.xml not serialized with IDs");
-                    WindupNotifier.notifyError("Windup results.xml not serialized with IDs. Please try re-running the analysis with the latest version of the Windup plugin.");
-                }
-
-                if (configuration.getSummary().completeIssues.contains(id)) {
-                    classification.complete = true;
-                }
-
-                classification.configuration = configuration;
-                configuration.getSummary().classifications.add(classification);
-
-                String title = WindupResultsParser.getValue(eElement,"classification");
-                if (title != null) {
-                    classification.title = title;
-                }
-
-                String description = WindupResultsParser.getValue(eElement,"description");
-                if (description != null) {
-                    classification.description = description;
-                }
-
-                String effort = WindupResultsParser.getValue(eElement,"effort");
-                if (effort != null) {
-                    classification.effort = effort;
-                }
-
-                String file = WindupResultsParser.getValue(eElement,"file");
-                if (file != null) {
-                    classification.file = file;
-                    String report = configuration.getSummary().reports.get(classification.file);
-                    if (report != null) {
-                        classification.report = report;
-                    }
-                }
-
-                String category = WindupResultsParser.getValue(eElement,"categoryID");
-                if (category != null) {
-                    classification.category = category;
-                }
-
-                NodeList links = eElement.getElementsByTagName("link");
-                for (int temp1 = 0; temp1 < links.getLength(); temp1++) {
-                    Node linkNode = links.item(temp1);
-                    if (linkNode.getNodeType() == Node.ELEMENT_NODE) {
-                        Link link = new Link();
-                        classification.links.add(link);
-                        link.id = WindupConfiguration.generateUniqueId();
-                        String linkDescription = WindupResultsParser.getValue((Element)linkNode,"description");
-                        if (linkDescription != null) {
-                            link.title = linkDescription;
-                        }
-                        String url = WindupResultsParser.getValue((Element)linkNode,"url");
-                        if (url != null) {
-                            link.url = url;
-                        }
-                    }
-                }
-                String ruleId = WindupResultsParser.getValue(eElement,"rule-id");
-                if (ruleId != null) {
-                    classification.ruleId = ruleId;
-                }
-            }
-        }
-    }
-
-    private static void computeQuickfixes(Hint hint,
-                                          Element element) {
-        NodeList quickfixList = element.getElementsByTagName("quickfix");
-        for (int temp = 0; temp < quickfixList.getLength(); temp++) {
-            Node quickfixNode = quickfixList.item(temp);
-            if (quickfixNode.getNodeType() == Node.ELEMENT_NODE) {
-
-                Element eElement = (Element) quickfixNode;
-                QuickFix quickfix = new QuickFix();
-                quickfix.id = eElement.getAttribute("id");
-                quickfix.issue = hint;
-                quickfix.file = hint.file;
-                quickfix.type = QuickFixType.REPLACE;
-                hint.quickfixes.add(quickfix);
-
-                String file = WindupResultsParser.getValue(eElement,"file");
-                if (file != null) {
-                    quickfix.file = file;
-                }
-
-                String name = WindupResultsParser.getValue(eElement,"name");
-                if (name != null) {
-                    quickfix.name = name;
-                }
-
-                String newLine = WindupResultsParser.getValue(eElement,"newLine");
-                if (newLine != null) {
-                    quickfix.newLine = newLine;
-                }
-
-                String replacement = WindupResultsParser.getValue(eElement,"replacement");
-                if (replacement != null) {
-                    quickfix.replacementString = replacement;
-                }
-
-                String search = WindupResultsParser.getValue(eElement,"search");
-                if (search != null) {
-                    quickfix.searchString = search;
-                }
-
-                String type = WindupResultsParser.getValue(eElement,"type");
-                if (type != null) {
-                    quickfix.type = QuickFixType.valueOf(type);
-                }
-            }
-        }
-    }
-
-    private static boolean isTextMimeType(Hint hint) {
-        File file = new File(hint.file);
-        FileNameMap fileNameMap = URLConnection.getFileNameMap();
-        String mimeType = fileNameMap.getContentTypeFor(file.getName());
-        if (mimeType != null && mimeType.startsWith("text")) {
-            return true;
-        }
-        else {
-            System.err.println("Hint corresponding to file " + hint.file +
-                    " contains unsupported mime type " + mimeType +
-                    " - Rule ID: " + hint.ruleId + " Hint: " + hint.hint);
-            return false;
-        }
-    }
-
-    private static String getValue(Element parent, String tag) {
-        Node item = parent.getElementsByTagName(tag).item(0);
-        if (item != null) {
-            return item.getTextContent();
-        }
-        return null;
-    }
-}
diff --git a/src/main/java/org/jboss/tools/intellij/windup/details/DetailsView.java b/src/main/java/org/jboss/tools/intellij/windup/details/DetailsView.java
index 93e77e6..377e61f 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/details/DetailsView.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/details/DetailsView.java
@@ -135,12 +135,12 @@ private void bindValues(Issue issue) {
         this.title.setText(issue.title);
 
         // Message or Description
-        boolean isHint = issue instanceof Hint;
+        boolean isHint = issue instanceof Incident;
         this.messageLabel.setText(isHint ? "Message" : "Description");
 
         String message = "---";
         if (isHint) {
-            String hint = ((Hint)issue).hint;
+            String hint = ((Incident)issue).getMessage();
             if (hint != null && !("".equals(hint))) {
                 message = hint;
             }
@@ -169,7 +169,7 @@ private void bindValues(Issue issue) {
         // Source Snippet
         if (isHint) {
             String snippet = "---";
-            String value = ((Hint)issue).sourceSnippet;
+            String value = ((Incident)issue).getCodeSnip();
             if (value != null && !("".equals(value))) {
                 snippet = value;
             }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/details/DetailsViewConsole.java b/src/main/java/org/jboss/tools/intellij/windup/details/DetailsViewConsole.java
index 5e23a12..9f7fe47 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/details/DetailsViewConsole.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/details/DetailsViewConsole.java
@@ -78,13 +78,13 @@ private void bindValues(Issue issue) {
         console.print("\n\n", valueType);
 
         // Message or Description
-        boolean isHint = issue instanceof Hint;
+        boolean isHint = issue instanceof Incident;
         String msgLabel = isHint ? "Message" : "Description";
         console.print(msgLabel, labelType);
 
         String message = "---";
         if (isHint) {
-            String hint = ((Hint)issue).hint;
+            String hint = ((Incident)issue).getMessage();
             if (hint != null && !("".equals(hint))) {
                 message = hint;
             }
@@ -117,7 +117,7 @@ private void bindValues(Issue issue) {
         // Source Snippet
         String snippet = "---";
         if (isHint) {
-            String value = ((Hint)issue).sourceSnippet;
+            String value = ((Incident)issue).getCodeSnip();
             if (value != null && !("".equals(value))) {
                 snippet = value;
             }
@@ -133,8 +133,8 @@ private void bindValues(Issue issue) {
         }
         else {
             for (Link link : issue.links) {
-                console.print(link.title + " - ", valueType);
-                console.printHyperlink(link.url, new BrowserHyperlinkInfo(link.url));
+                console.print(link.getTitle() + " - ", valueType);
+                console.printHyperlink(link.getUrl(), new BrowserHyperlinkInfo(link.getUrl()));
                 console.print("\n", valueType);
             }
         }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/details/OpenIssueDetailsAction.java b/src/main/java/org/jboss/tools/intellij/windup/details/OpenIssueDetailsAction.java
index 6555486..1dba670 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/details/OpenIssueDetailsAction.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/details/OpenIssueDetailsAction.java
@@ -16,7 +16,6 @@
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
-import java.util.Arrays;
 
 public class OpenIssueDetailsAction extends StructureTreeAction {
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/editor/ChromiumConfigurationEditor.java b/src/main/java/org/jboss/tools/intellij/windup/editor/ChromiumConfigurationEditor.java
index 8ef57dc..eb5fc21 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/editor/ChromiumConfigurationEditor.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/editor/ChromiumConfigurationEditor.java
@@ -6,10 +6,10 @@
 import com.intellij.openapi.Disposable;
 import com.intellij.ui.jcef.JBCefApp;
 import com.intellij.ui.jcef.JBCefBrowser;
-import org.cef.browser.CefBrowser;
 import org.jboss.tools.intellij.windup.editor.server.ConfigurationEditorVerticle;
 import org.jboss.tools.intellij.windup.editor.server.VertxService;
 import org.jboss.tools.intellij.windup.model.WindupConfiguration;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 
 import javax.swing.*;
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/editor/ConfigurationEditorWrapper.java b/src/main/java/org/jboss/tools/intellij/windup/editor/ConfigurationEditorWrapper.java
index 53105ea..b942f79 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/editor/ConfigurationEditorWrapper.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/editor/ConfigurationEditorWrapper.java
@@ -10,12 +10,10 @@
 import com.intellij.openapi.fileEditor.FileEditorLocation;
 import com.intellij.openapi.fileEditor.FileEditorState;
 import com.intellij.openapi.fileEditor.FileEditorStateLevel;
-import com.intellij.openapi.fileEditor.impl.EditorTabTitleProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/editor/server/ConfigurationEditorVerticle.java b/src/main/java/org/jboss/tools/intellij/windup/editor/server/ConfigurationEditorVerticle.java
index 4459c79..45fbd4c 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/editor/server/ConfigurationEditorVerticle.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/editor/server/ConfigurationEditorVerticle.java
@@ -7,15 +7,9 @@
 import com.google.common.collect.Sets;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.command.CommandProcessor;
-import com.intellij.openapi.editor.DocumentRunnable;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDialog;
 import com.intellij.openapi.fileChooser.FileChooserFactory;
-import com.intellij.openapi.fileEditor.FileEditor;
-import com.intellij.openapi.fileEditor.FileEditorManager;
-import com.intellij.openapi.fileEditor.OpenFileDescriptor;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.Handler;
@@ -31,7 +25,6 @@
 import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jboss.tools.intellij.windup.services.ModelService;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/WindupExplorerFactory.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/WindupExplorerFactory.java
index debeb8f..7ae3069 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/WindupExplorerFactory.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/WindupExplorerFactory.java
@@ -3,9 +3,6 @@
  *--------------------------------------------------------------------------------------------*/
 package org.jboss.tools.intellij.windup.explorer;
 
-import com.google.common.collect.Lists;
-import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.wm.ToolWindow;
@@ -14,8 +11,8 @@
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManager;
 import org.jboss.tools.intellij.windup.explorer.nodes.ConfigurationNode;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jboss.tools.intellij.windup.model.NameUtil;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jboss.tools.intellij.windup.services.ModelService;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/WindupToolWindow.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/WindupToolWindow.java
index 2f57371..e3ccd47 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/WindupToolWindow.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/WindupToolWindow.java
@@ -5,24 +5,17 @@
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.ActionPlaces;
-import com.intellij.openapi.fileEditor.FileEditorManager;
-import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.ui.*;
 import com.intellij.ui.components.panels.NonOpaquePanel;
-import com.intellij.ui.content.Content;
-import com.intellij.ui.content.ContentManager;
 import com.intellij.ui.tree.AsyncTreeModel;
 import com.intellij.ui.tree.StructureTreeModel;
 import com.intellij.ui.treeStructure.Tree;
 import org.jboss.tools.intellij.windup.cli.WindupCliRunner;
-import org.jboss.tools.intellij.windup.editor.ConfigurationFile;
 import org.jboss.tools.intellij.windup.editor.server.VertxService;
 import org.jboss.tools.intellij.windup.explorer.nodes.*;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jboss.tools.intellij.windup.model.WindupModel;
 import org.jboss.tools.intellij.windup.services.ModelService;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/ApplyAllQuickfixAction.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/ApplyAllQuickfixAction.java
index f711a3c..bf1eeaa 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/ApplyAllQuickfixAction.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/ApplyAllQuickfixAction.java
@@ -73,10 +73,10 @@ private void applyQuickfixes(WindupExplorerNode explorerNode, Project project) {
                     QuickfixUtil.applyQuickfix(quickfix, project, newValue);
                 }
                 else {
-                    Hint hint = (Hint)quickfix.issue;
+                    Incident hint = (Incident)quickfix.issue;
                     System.out.println("Quickfix could not be applied.");
                     System.out.println("File: " + hint.file);
-                    System.out.println("Line: " + hint.lineNumber);
+                    System.out.println("Line: " + hint.getLineNumber());
                     System.out.println("Search: " + quickfix.searchString);
                     System.out.println("Replace: " + quickfix.replacementString);
                 }
@@ -91,7 +91,7 @@ private void applyQuickfixes(WindupExplorerNode explorerNode, Project project) {
         }
     }
 
-    private List<QuickFix> getQuickfixes(Hint hint) {
+    private List<QuickFix> getQuickfixes(Incident hint) {
         List<QuickFix> quickfixes = Lists.newArrayList();
         if (!hint.quickfixes.isEmpty()) {
             quickfixes.addAll(hint.quickfixes);
@@ -101,7 +101,7 @@ private List<QuickFix> getQuickfixes(Hint hint) {
 
     private List<QuickFix> computeQuickfixes(WindupExplorerNode explorerNode) {
         if (explorerNode instanceof QuickfixGroupNode) {
-            Hint hint = ((QuickfixGroupNode)explorerNode).getHint();
+            Incident hint = ((QuickfixGroupNode)explorerNode).getHint();
             return this.getQuickfixes(hint);
         }
         if (explorerNode instanceof QuickfixNode) {
@@ -116,8 +116,8 @@ private List<QuickFix> computeQuickfixes(WindupExplorerNode explorerNode) {
         if (explorerNode.getSummary() != null && (explorerNode instanceof ConfigurationNode || explorerNode instanceof AnalysisResultsNode)) {
             List<Issue> issues = explorerNode.getSummary().getIssues();
             return issues.stream()
-                    .filter(issue -> issue instanceof Hint)
-                    .map(issue -> (Hint)issue)
+                    .filter(issue -> issue instanceof Incident)
+                    .map(issue -> (Incident)issue)
                     .map(hint -> this.getQuickfixes(hint))
                     .flatMap(fixes -> fixes.stream())
                     .collect(Collectors.toList());
@@ -129,8 +129,8 @@ private List<QuickFix> computeQuickfixes(WindupExplorerNode explorerNode) {
             ResourceNode node = (ResourceNode)explorerNode;
             return explorerNode.getSummary().getIssues()
                     .stream()
-                    .filter(issue -> issue instanceof Hint)
-                    .map(issue -> (Hint)issue)
+                    .filter(issue -> issue instanceof Incident)
+                    .map(issue -> (Incident)issue)
                     .filter(hint -> this.isChildFile(node.file, hint.file))
                     .map(hint -> this.getQuickfixes(hint))
                     .flatMap(List::stream)
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/ApplyQuickfixAction.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/ApplyQuickfixAction.java
index f75e259..bfefc84 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/ApplyQuickfixAction.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/ApplyQuickfixAction.java
@@ -3,24 +3,14 @@
  *--------------------------------------------------------------------------------------------*/
 package org.jboss.tools.intellij.windup.explorer.actions;
 
-import com.intellij.diff.DiffContentFactory;
-import com.intellij.diff.DiffManager;
-import com.intellij.diff.DiffRequestPanel;
-import com.intellij.diff.contents.DocumentContent;
-import com.intellij.diff.requests.SimpleDiffRequest;
-import com.intellij.diff.util.DiffUserDataKeys;
-import com.intellij.diff.util.Side;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogBuilder;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.util.Pair;
 import com.intellij.ui.treeStructure.Tree;
 import org.jboss.tools.intellij.windup.explorer.WindupTreeCellRenderer;
 import org.jboss.tools.intellij.windup.explorer.dialog.WindupNotifier;
 import org.jboss.tools.intellij.windup.explorer.nodes.HintNode;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jboss.tools.intellij.windup.model.QuickfixUtil;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 
 import javax.swing.tree.TreePath;
 
@@ -36,7 +26,7 @@ public void actionPerformed(AnActionEvent anActionEvent, TreePath path, Object s
         WindupTreeCellRenderer renderer = (WindupTreeCellRenderer) tree.getCellRenderer();
         Project project = renderer.getModelService().getProject();
         HintNode node = (HintNode)super.adjust(selected);
-        WindupConfiguration.Hint hint = node.getValue();
+        WindupConfiguration.Incident hint = node.getValue();
         try {
             WindupConfiguration.QuickFix quickfix = hint.quickfixes.size() > 1 ? hint.quickfixes.get(1) : hint.quickfixes.get(0);
             String newValue = QuickfixUtil.getQuickFixedContent(quickfix);
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/MarkIssueCompleteAction.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/MarkIssueCompleteAction.java
index 49ecf42..a7ce08a 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/MarkIssueCompleteAction.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/MarkIssueCompleteAction.java
@@ -7,7 +7,6 @@
 import com.intellij.ui.treeStructure.Tree;
 import org.jboss.tools.intellij.windup.explorer.WindupTreeCellRenderer;
 import org.jboss.tools.intellij.windup.explorer.nodes.IssueNode;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 
 import javax.swing.tree.TreePath;
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/NewConfigurationAction.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/NewConfigurationAction.java
index 03ba3a3..1fe48b0 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/NewConfigurationAction.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/NewConfigurationAction.java
@@ -9,9 +9,6 @@
 import org.jboss.tools.intellij.windup.explorer.nodes.ConfigurationNode;
 import org.jboss.tools.intellij.windup.explorer.nodes.WindupExplorerNode;
 import org.jboss.tools.intellij.windup.model.WindupConfiguration;
-import org.jboss.tools.intellij.windup.model.WindupModel;
-import org.jboss.tools.intellij.windup.model.NameUtil;
-import org.jboss.tools.intellij.windup.services.ModelService;
 
 import javax.swing.tree.TreePath;
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/PreviewQuickfixAction.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/PreviewQuickfixAction.java
index 839a6b7..301460a 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/PreviewQuickfixAction.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/PreviewQuickfixAction.java
@@ -19,8 +19,8 @@
 import org.jboss.tools.intellij.windup.explorer.WindupTreeCellRenderer;
 import org.jboss.tools.intellij.windup.explorer.dialog.WindupNotifier;
 import org.jboss.tools.intellij.windup.explorer.nodes.HintNode;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jboss.tools.intellij.windup.model.QuickfixUtil;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 
 import javax.swing.tree.TreePath;
 import java.io.File;
@@ -36,13 +36,13 @@ public void actionPerformed(AnActionEvent anActionEvent, TreePath path, Object s
         Tree tree = super.getTree(anActionEvent);
         WindupTreeCellRenderer renderer = (WindupTreeCellRenderer) tree.getCellRenderer();
         HintNode hintNode = (HintNode)super.adjust(selected);
-        WindupConfiguration.Hint hint = hintNode.getValue();
+        WindupConfiguration.Incident hint = hintNode.getValue();
         WindupConfiguration.QuickFix quickfix = hintNode.getValue().quickfixes.size() > 1 ? hint.quickfixes.get(1) : hint.quickfixes.get(0);
         PreviewQuickfixAction.openPreviewAndApply(quickfix, hintNode, path, renderer);
     }
 
     public static void openPreviewAndApply(WindupConfiguration.QuickFix quickfix, HintNode node, TreePath path, WindupTreeCellRenderer renderer) {
-        WindupConfiguration.Hint hint = node.getValue();
+        WindupConfiguration.Incident hint = node.getValue();
         try {
             Project project = renderer.getModelService().getProject();
             String oldValue = org.apache.commons.io.FileUtils.readFileToString(new File(hint.file));
@@ -58,7 +58,7 @@ public static void openPreviewAndApply(WindupConfiguration.QuickFix quickfix, Hi
             else {
                 System.out.println("Quickfix could not be applied.");
                 System.out.println("File: " + hint.file);
-                System.out.println("Line: " + hint.lineNumber);
+                System.out.println("Line: " + hint.getLineNumber());
                 System.out.println("Search: " + quickfix.searchString);
                 System.out.println("Replace: " + quickfix.replacementString);
                 WindupNotifier.notifyError("Cannot apply quickfix");
@@ -70,7 +70,7 @@ public static void openPreviewAndApply(WindupConfiguration.QuickFix quickfix, Hi
         }
     }
 
-    public static boolean openPreview(WindupConfiguration.Hint hint, Project project, String oldValue, String newValue) {
+    public static boolean openPreview(WindupConfiguration.Incident hint, Project project, String oldValue, String newValue) {
         try {
             DocumentContent oldContent = DiffContentFactory.getInstance().create(oldValue);
             DocumentContent newContent = DiffContentFactory.getInstance().create(newValue);
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/RunConfigurationAction.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/RunConfigurationAction.java
index 11f44d2..3744c9e 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/RunConfigurationAction.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/actions/RunConfigurationAction.java
@@ -32,17 +32,21 @@ public void actionPerformed(AnActionEvent anActionEvent, TreePath path, Object s
         ConfigurationNode node = (ConfigurationNode)super.adjust(selected);
         WindupConfiguration configuration = node.getValue();
         ModelService modelService = node.getModelService();
+        System.out.println("********************* This is actionPerformed****************************");
         if (this.validateConfiguration(configuration)) {
             String executable = (String)configuration.getOptions().get("cli");
             try {
                 String windupHome = new File(executable).getParentFile().getParent();
-                List<String> params = WindupCliParamBuilder.buildParams(configuration, windupHome);
+                List<String> params = KantraCliParamBuilder.buildParams(configuration, windupHome);
                 RunAnalysisCommandHandler handler = new RunAnalysisCommandHandler(
                         anActionEvent.getProject(),
                         executable,
                         params,
                         console,
-                        () -> this.loadAnalysisResults(configuration, modelService, node.getTreeModel()));
+                        () ->{
+                            this.loadAnalysisResults(configuration, modelService, node.getTreeModel());
+                            System.out.println("********************This is an end of Action performed*********************");
+                        });
                 RunConfigurationAction.running = true;
                 handler.runAnalysis();
             }
@@ -73,8 +77,8 @@ private void loadAnalysisResults(WindupConfiguration configuration, ModelService
         WindupConfiguration.AnalysisResultsSummary summary = new WindupConfiguration.AnalysisResultsSummary(modelService);
         summary.outputLocation = (String)configuration.getOptions().get("output");
         configuration.setSummary(summary);
-        WindupResultsParser.loadAndPersistIDs(configuration, summary.outputLocation);
-        WindupResultsParser.parseResults(configuration);
+        RulesetParser.parseRulesetForKantraConfig(configuration);
+        System.out.println(configuration.getSummary().getIssues().size());
         modelService.saveModel();
         treeModel.invalidate();
     }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/AnalysisResultsNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/AnalysisResultsNode.java
index 7bdf915..b59855a 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/AnalysisResultsNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/AnalysisResultsNode.java
@@ -9,15 +9,11 @@
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import org.apache.commons.io.comparator.NameFileComparator;
 import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 import org.jboss.tools.intellij.windup.services.ModelService;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class AnalysisResultsNode extends WindupExplorerNode<AnalysisResultsSummary> {
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ClassificationNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ClassificationNode.java
index e460582..268b855 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ClassificationNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ClassificationNode.java
@@ -11,7 +11,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
-import java.util.List;
 
 public class ClassificationNode extends IssueNode<Classification> {
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ClassificationsGroupNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ClassificationsGroupNode.java
index 9193b8f..a6a81ab 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ClassificationsGroupNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ClassificationsGroupNode.java
@@ -4,7 +4,6 @@
 package org.jboss.tools.intellij.windup.explorer.nodes;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
@@ -13,9 +12,7 @@
 
 import java.io.File;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 public class ClassificationsGroupNode extends ResourceNode {
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ConfigurationNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ConfigurationNode.java
index 0d96f82..9d69837 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ConfigurationNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ConfigurationNode.java
@@ -3,7 +3,6 @@
  *--------------------------------------------------------------------------------------------*/
 package org.jboss.tools.intellij.windup.explorer.nodes;
 
-import com.google.common.collect.Lists;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -14,12 +13,10 @@
 import org.jboss.tools.intellij.windup.editor.ConfigurationFile;
 import org.jboss.tools.intellij.windup.editor.server.VertxService;
 import org.jboss.tools.intellij.windup.model.WindupConfiguration;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 import org.jboss.tools.intellij.windup.services.ModelService;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
-import java.util.List;
 
 public class ConfigurationNode extends WindupExplorerNode<WindupConfiguration> {
 
@@ -32,6 +29,7 @@ public ConfigurationNode(WindupConfiguration configuration, ModelService modelSe
         this.modelService = modelService;
         this.vertxService = vertxService;
         this.treeModel = treeModel;
+        System.out.println ("<<<<<<<<<<<< This is ConfigurationNode >>>>>>>>>");
     }
 
     @Override
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/FileNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/FileNode.java
index 6e2f996..8c4f3ee 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/FileNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/FileNode.java
@@ -29,7 +29,7 @@ private void computeIssue() {
         boolean containsClassifications = false;
         for (Issue issue : super.summary.getIssues()) {
             if (issue.file.equals(this.file.getAbsolutePath())) {
-                if (issue instanceof Hint) {
+                if (issue instanceof Incident) {
                     containsHints = true;
                 }
                 else {
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/FolderNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/FolderNode.java
index a33a2ec..2372f5a 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/FolderNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/FolderNode.java
@@ -8,8 +8,8 @@
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 import org.jetbrains.annotations.NotNull;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 
 import java.io.File;
 import java.util.*;
@@ -18,6 +18,7 @@ public class FolderNode extends ResourceNode {
 
     public FolderNode(AnalysisResultsSummary summary, String file) {
         super(summary, file);
+        System.out.println ("<<<<<<<<<<<<< This is FolderNode >>>>>>>>>>>>");
     }
 
     @Override
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/HintNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/HintNode.java
index 1d8f175..145dc17 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/HintNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/HintNode.java
@@ -6,18 +6,16 @@
 import com.google.common.collect.Lists;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
-import com.intellij.ide.util.treeView.AbstractTreeNode;
-import com.intellij.openapi.project.Project;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 import org.jetbrains.annotations.NotNull;
-
+import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 import java.util.Collection;
 import java.util.List;
 
-public class HintNode extends IssueNode<Hint> {
+public class HintNode extends IssueNode<Incident> {
 
-    public HintNode(Hint hint) {
+    public HintNode(Incident hint) {
         super(hint);
+        System.out.println("<<<<<<<<<<<<<<<<This is hint node>>>>>>>>>>>>>>>>>  " + hint.file);
     }
 
     @NotNull
@@ -33,7 +31,7 @@ public Collection<WindupExplorerNode<?>> getChildren() {
     @Override
     protected void update(PresentationData presentation) {
         presentation.setPresentableText(super.getValue().title);
-        Hint hint = this.getValue();
+        Incident hint = this.getValue();
         if (hint.complete) {
             presentation.setIcon(AllIcons.Actions.Commit);
         }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/HintsGroupNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/HintsGroupNode.java
index 22a691a..2f3e54c 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/HintsGroupNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/HintsGroupNode.java
@@ -7,16 +7,15 @@
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jetbrains.annotations.NotNull;
-
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
 
 public class HintsGroupNode extends ResourceNode {
 
-    private List<WindupConfiguration.Hint> hints = Lists.newArrayList();
+    private List<WindupConfiguration.Incident> hints = Lists.newArrayList();
 
     public HintsGroupNode(WindupConfiguration.AnalysisResultsSummary summary, String file) {
         super(summary, file);
@@ -24,9 +23,9 @@ public HintsGroupNode(WindupConfiguration.AnalysisResultsSummary summary, String
     }
 
     private void computeIssue() {
-        List<WindupConfiguration.Hint> hints = this.summary.hints;
-        hints.sort(Comparator.comparingInt(o -> o.lineNumber));
-        for (WindupConfiguration.Hint hint : hints) {
+        List<WindupConfiguration.Incident> hints = this.summary.incidents;
+        hints.sort(Comparator.comparingInt(o -> o.getLineNumber()));
+        for (WindupConfiguration.Incident hint : hints) {
             if (hint.file.equals(this.file.getAbsolutePath())) {
                 this.hints.add(hint);
             }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/IssueNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/IssueNode.java
index efdb516..3343130 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/IssueNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/IssueNode.java
@@ -36,11 +36,11 @@ public void onClick(Project project) {
                     found = true;
                     try {
                         Issue issue = super.getValue();
-                        if (issue instanceof Hint) {
-                            Hint hint = (Hint)issue;
-                            Editor editor = FileEditorManager.getInstance(project).openTextEditor(new OpenFileDescriptor(project, vFile, hint.lineNumber - 1, hint.column), true);
+                        if (issue instanceof Incident) {
+                            Incident hint = (Incident)issue;
+                            Editor editor = FileEditorManager.getInstance(project).openTextEditor(new OpenFileDescriptor(project, vFile, hint.getLineNumber() - 1, 0), true);
                             int offset1 = editor.getSelectionModel().getLeadSelectionOffset();
-                            editor.getSelectionModel().setSelection(offset1, offset1+hint.length);
+                            editor.getSelectionModel().setSelection(offset1, offset1+2);
                         }
                         else {
                             new OpenFileDescriptor(project, vFile, 0).navigate(true);
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/QuickfixGroupNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/QuickfixGroupNode.java
index fdd8cca..826fe17 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/QuickfixGroupNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/QuickfixGroupNode.java
@@ -7,9 +7,8 @@
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jetbrains.annotations.NotNull;
-
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import java.util.*;
 import java.util.stream.Collectors;
 import static org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
@@ -17,9 +16,9 @@
 public class QuickfixGroupNode extends ResourceNode {
 
     private HintNode hintNode;
-    private Hint hint;
+    private Incident hint;
 
-    public QuickfixGroupNode(HintNode hintNode, WindupConfiguration.Hint hint) {
+    public QuickfixGroupNode(HintNode hintNode, WindupConfiguration.Incident hint) {
         super(hint.configuration.getSummary(), hint.file);
         this.hintNode = hintNode;
         this.hint = this.hintNode.getValue();
@@ -56,7 +55,7 @@ public HintNode getHintNode() {
         return this.hintNode;
     }
 
-    public Hint getHint() {
+    public Incident getHint() {
         return this.hint;
     }
 }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/QuickfixNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/QuickfixNode.java
index 4ba42f3..3cc1ee5 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/QuickfixNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/QuickfixNode.java
@@ -56,7 +56,7 @@ public HintNode getHintNode() {
         return this.hintNode;
     }
 
-    public WindupConfiguration.Hint getHint() {
+    public WindupConfiguration.Incident getHint() {
         return this.hintNode.getValue();
     }
 }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ReportNode.java b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ReportNode.java
index ccd9ced..a0a745f 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ReportNode.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/explorer/nodes/ReportNode.java
@@ -11,12 +11,10 @@
 import com.intellij.openapi.project.Project;
 import org.jboss.tools.intellij.windup.explorer.dialog.WindupNotifier;
 import org.jboss.tools.intellij.windup.model.WindupConfiguration;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.Collection;
-import java.util.List;
 
 public class ReportNode extends WindupExplorerNode<WindupConfiguration> {
 
diff --git a/src/main/java/org/jboss/tools/intellij/windup/model/KantraConfiguration.java b/src/main/java/org/jboss/tools/intellij/windup/model/KantraConfiguration.java
deleted file mode 100644
index c97e271..0000000
--- a/src/main/java/org/jboss/tools/intellij/windup/model/KantraConfiguration.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Red Hat. All rights reserved.
- *--------------------------------------------------------------------------------------------*/
-package org.jboss.tools.intellij.windup.model;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import org.apache.commons.compress.utils.Lists;
-import org.jboss.tools.intellij.windup.explorer.nodes.ConfigurationNode;
-import org.jboss.tools.intellij.windup.services.ModelService;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-
-public class KantraConfiguration {
-
-    private String name;
-    private String id;
-    private Map<String, Object> options = Maps.newHashMap();
-    private ConfigurationNode node;
-    private AnalysisResultsSummary summary;
-    private List<Ruleset> rulesets;
-
-
-    public AnalysisResultsSummary getSummary() {
-        return this.summary;
-    }
-
-    public void setSummary(AnalysisResultsSummary summary) {
-        this.summary = summary;
-    }
-    public void setRulesets(List<Ruleset> rulesets) {
-        this.rulesets = rulesets;
-    }
-
-    public Map<String, Object> getOptions() {
-        return this.options;
-    }
-    public void addOption(String option, Object value) {
-        this.options.put(option, value);
-    }
-    public List<Ruleset> getRulesets() {
-        return this.rulesets;
-    }
-
-    public void addRuleset (Ruleset ruleset){
-        this.rulesets.add(ruleset);
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public ConfigurationNode getNode() {
-        return this.node;
-    }
-
-    public void setNode(ConfigurationNode node) {
-        this.node = node;
-    }
-
-    public String getReportLocation() {
-        String output = (String)this.options.get("output");
-        if (output == null || output.isEmpty()) return null;
-        Path location = Paths.get(output + File.separator +"static-report","index.html");
-        return location.toAbsolutePath().toString();
-    }
-    public String getRulesetResultLocation() {
-        String output = (String)this.options.get("output");
-        if (output == null || output.isEmpty()) return null;
-        Path location = Paths.get(output,"output.yaml");
-        return location.toAbsolutePath().toString();
-    }
-    public boolean skippedReports() {
-        String skippedReports = (String) this.getOptions().get("skipReports");
-        return skippedReports != null ? Boolean.valueOf(skippedReports) : false;
-    }
-
-    public static String generateUniqueId() {
-        return UUID.randomUUID().toString();
-    }
-
-    public static class AnalysisResultsSummary {
-        public String executedTimestamp;
-        public String executionDuration;
-        public String outputLocation;
-        public String executable;
-        public int hintCount;
-        public int classificationCount;
-
-        private List<Ruleset> rulesets;
-        private ModelService modelService;
-
-        public void setRulesets(List<Ruleset> rulesets) {
-            this.rulesets = rulesets;
-        }
-        public List<Ruleset> getRulesets() {
-            return this.rulesets;
-        }
-
-        public Set<String> completeIssues = Sets.newHashSet();
-        public Set<String> deletedIssues = Sets.newHashSet();
-        public Map<String, String> reports = Maps.newHashMap();
-
-        public List<Incident> incidents = Lists.newArrayList();
-        public List<Classification> classifications = Lists.newArrayList();
-
-        public AnalysisResultsSummary(ModelService modelService) {
-            this.modelService = modelService;
-        }
-
-        public ModelService getModelService() {
-            return this.modelService;
-        }
-
-        public List<Issue> getIssues() {
-            List<Issue> issues = Lists.newArrayList();
-            issues.addAll(this.incidents);
-            issues.addAll(this.classifications);
-            return issues;
-        }
-
-    }
-
-    public static class Ruleset {
-        private String name;
-        private String description;
-        private List<String> unmatched = Lists.newArrayList();
-        private List<String> tags = Lists.newArrayList();;
-        private List<String> skipped = Lists.newArrayList();
-        private Map<String, Violation> violations;
-        private Map<String, String> errors;
-
-        public Map<String, String> getErrors() {
-            return errors;
-        }
-
-        public void setErrors(Map<String, String> errors) {
-            this.errors = errors;
-        }
-
-        public Map<String, Violation> getViolations() {
-            return violations;
-        }
-
-        public void setViolations(Map<String, Violation> violations) {
-            this.violations = violations;
-        }
-
-        public String getDescription() {
-            return this.description;
-        }
-
-        public void setDescription(String description) {
-            this.description = description;
-        }
-
-        public List<String> getSkipped() {
-            return this.skipped;
-        }
-
-        public void setSkipped(List<String> skipped) {
-            this.skipped = skipped;
-        }
-
-        public String getName() {
-            return this.name;
-        }
-
-        public List<String> getUnmatched() {
-            return this.unmatched;
-        }
-
-        public List<String> getTags() {
-            return this.tags;
-        }
-
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public void setUnmatched(List<String> unmatched) {
-            this.unmatched = unmatched;
-        }
-
-        public void setTags(List<String> tags) {
-            this.tags = tags;
-        }
-
-        public void addTags(String tag){
-            this.tags.add(tag);
-        }
-        public void addViolation(String key,Violation violation){
-            this.violations.put(key, violation);
-        }
-
-    }
-
-    public static enum Category{
-        POTENTIAL("potential"),
-        OPTIONAL("optional"),
-        MANDATORY("mandatory");
-        String type;
-        Category(String type){
-            this.type = type;
-        }
-
-    }
-    public static class Violation{
-        private String description;
-        private List<String> labels  = Lists.newArrayList();
-        private List<Incident> incidents = Lists.newArrayList();
-        private List<Link> links = Lists.newArrayList();
-        private int effort;
-        private String category ;
-
-        public String getCategory() {
-            return category;
-        }
-
-        public void setCategory(String category) {
-            this.category = category;
-        }
-
-        public List<Link> getLinks() {
-            return links;
-        }
-
-        public void setLinks(List<Link> links) {
-            this.links = links;
-        }
-
-
-
-        public List<Incident> getIncidents() {
-            return incidents;
-        }
-
-        public void setIncidents(List<Incident> incidents) {
-            this.incidents = incidents;
-        }
-
-        public String getDescription() {
-            return this.description;
-        }
-
-        public void setDescription(String description) {
-            this.description = description;
-        }
-
-        public List<String> getLabels() {
-            return this.labels;
-        }
-
-        public void setLabels(List<String> labels) {
-            this.labels = labels;
-        }
-
-
-        public int getEffort() {
-            return this.effort;
-        }
-
-
-        public void setEffort(int effort) {
-            this.effort = effort;
-        }
-
-        public void addLabel(String label){
-            this.labels.add(label);
-        }
-
-        public void addIncidents(Incident incident){
-            this.incidents.add(incident);
-        }
-
-    }
-
-    public static class Incident extends Issue{
-        private String uri;
-        private String message;
-        private String codeSnip;
-        private int lineNumber;
-        private  Map<String, String > variables;
-
-        public Map<String, String> getVariables() {
-            return variables;
-        }
-
-        public void setVariables(Map<String, String> variables) {
-            this.variables = variables;
-        }
-
-        public void addVariables(String key,String value){
-            this.variables.put(key, value);
-        }
-        public String getUri() {
-            return this.uri;
-        }
-
-        public void setUri(String uri) {
-            this.uri = uri;
-        }
-
-        public String getMessage() {
-            return this.message;
-        }
-
-        public void setMessage(String message) {
-            this.message = message;
-        }
-
-        public String getCodeSnip() {
-            return this.codeSnip;
-        }
-
-        public void setCodeSnip(String codeSnip) {
-            this.codeSnip = codeSnip;
-        }
-
-        public int getLineNumber() {
-            return this.lineNumber;
-        }
-
-        public void setLineNumber(int lineNumber) {
-            this.lineNumber = lineNumber;
-        }
-
-
-    }
-
-    public static class Link{
-        private String url;
-        private String title;
-        public String getUrl() {
-            return url;
-        }
-        public void setUrl(String url) {
-            this.url = url;
-        }
-        public String getTitle() {
-            return title;
-        }
-        public void setTitle(String title) {
-            this.title = title;
-        }
-    }
-
-    public static class UniqueElement {
-        public String id;
-    }
-
-    public static class Classification extends Issue {
-        public String description;
-    }
-    public static class Issue extends UniqueElement {
-        public String title;
-        public String originalLineSource;
-        public String file;
-        public String severity;
-        public String ruleId;
-        public String effort;
-        public ArrayList<Link> links = Lists.newArrayList();
-        public String report;
-        public String category;
-        public KantraConfiguration configuration;
-        public Object dom;
-        public boolean complete;
-        public boolean deleted;
-    }
-
-
-}
diff --git a/src/main/java/org/jboss/tools/intellij/windup/model/KantraModel.java b/src/main/java/org/jboss/tools/intellij/windup/model/KantraModel.java
index c25224b..0a165f9 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/model/KantraModel.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/model/KantraModel.java
@@ -1,24 +1,24 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Red Hat. All rights reserved.
- *--------------------------------------------------------------------------------------------*/
-package org.jboss.tools.intellij.windup.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class KantraModel {
-
-    private List<KantraConfiguration> configurations = new ArrayList<>();
-
-    public void addConfiguration(KantraConfiguration configuration) {
-        this.configurations.add(configuration);
-    }
-
-    public boolean deleteConfiguration(KantraConfiguration configuration) {
-        return this.configurations.remove(configuration);
-    }
-    
-    public List<KantraConfiguration> getConfigurations() {
-        return this.configurations;
-    }
-}
\ No newline at end of file
+///*---------------------------------------------------------------------------------------------
+// *  Copyright (c) Red Hat. All rights reserved.
+// *--------------------------------------------------------------------------------------------*/
+//package org.jboss.tools.intellij.windup.model;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//public class KantraModel {
+//
+//    private List<KantraConfiguration> configurations = new ArrayList<>();
+//
+//    public void addConfiguration(KantraConfiguration configuration) {
+//        this.configurations.add(configuration);
+//    }
+//
+//    public boolean deleteConfiguration(KantraConfiguration configuration) {
+//        return this.configurations.remove(configuration);
+//    }
+//
+//    public List<KantraConfiguration> getConfigurations() {
+//        return this.configurations;
+//    }
+//}
\ No newline at end of file
diff --git a/src/main/java/org/jboss/tools/intellij/windup/model/QuickfixUtil.java b/src/main/java/org/jboss/tools/intellij/windup/model/QuickfixUtil.java
index e23c467..43788cd 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/model/QuickfixUtil.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/model/QuickfixUtil.java
@@ -45,10 +45,10 @@ public static String getQuickFixedContent(QuickFix quickFix) throws Exception {
         String searchString = quickFix.searchString;
         String replacementString = quickFix.replacementString;
 
-        Hint hint = (Hint)quickFix.issue;
+        Incident hint = (Incident)quickFix.issue;
         String type = quickFix.type.type;
         if (QuickFixType.REPLACE.toString().equals(type) && new File(quickFix.file).getName().equals("pom.xml")) {
-            int lineNumber = ((Hint) quickFix.issue).lineNumber-1;
+            int lineNumber = ((Incident) quickFix.issue).getLineNumber()-1;
             String currentText = FileUtil.getLine(quickFix.file, lineNumber);
             if (currentText.contains(searchString)) {
                 FileUtil.replace(document, lineNumber, searchString, replacementString);
@@ -91,17 +91,17 @@ else if (line.contains("<artifactId>")) {
             return null;
         }
         else if (QuickFixType.REPLACE.toString().equals(type)) {
-            int lineNumber = hint.lineNumber-1;
+            int lineNumber = hint.getLineNumber()-1;
             FileUtil.replace(document, lineNumber, searchString, replacementString);
             return document.get();
         }
         else if (QuickFixType.DELETE_LINE.toString().equals(type)) {
-            int lineNumber = hint.lineNumber-1;
+            int lineNumber = hint.getLineNumber()-1;
             FileUtil.deleteLine(document, lineNumber);
             return document.get();
         }
         else if (QuickFixType.INSERT_LINE.toString().equals(type)) {
-            int lineNumber = hint.lineNumber;
+            int lineNumber = hint.getLineNumber();
             lineNumber = lineNumber > 1 ? lineNumber - 2 : lineNumber-1;
             String newLine = replacementString;
             try {
diff --git a/src/main/java/org/jboss/tools/intellij/windup/model/WindupConfiguration.java b/src/main/java/org/jboss/tools/intellij/windup/model/WindupConfiguration.java
index 56ddcf2..1e6c5b1 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/model/WindupConfiguration.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/model/WindupConfiguration.java
@@ -3,31 +3,26 @@
  *--------------------------------------------------------------------------------------------*/
 package org.jboss.tools.intellij.windup.model;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import org.apache.commons.compress.utils.Lists;
 import org.jboss.tools.intellij.windup.explorer.nodes.ConfigurationNode;
 import org.jboss.tools.intellij.windup.services.ModelService;
 
+import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
 
 public class WindupConfiguration {
 
-    private Map<String, Object> options = Maps.newHashMap();
     private String name;
     private String id;
-    private AnalysisResultsSummary summary;
+    private Map<String, Object> options = Maps.newHashMap();
     private ConfigurationNode node;
+    private AnalysisResultsSummary summary;
+    private List<Ruleset> rulesets;
 
-    public Map<String, Object> getOptions() {
-        return this.options;
-    }
-
-    public void addOption(String option, Object value) {
-        this.options.put(option, value);
-    }
 
     public AnalysisResultsSummary getSummary() {
         return this.summary;
@@ -36,17 +31,22 @@ public AnalysisResultsSummary getSummary() {
     public void setSummary(AnalysisResultsSummary summary) {
         this.summary = summary;
     }
+    public void setRulesets(List<Ruleset> rulesets) {
+        this.rulesets = rulesets;
+    }
 
-    public String getReportLocation() {
-        String output = (String)this.options.get("output");
-        if (output == null || output.isEmpty()) return null;
-        Path location = Paths.get(output,"index.html");
-        return location.toAbsolutePath().toString();
+    public Map<String, Object> getOptions() {
+        return this.options;
+    }
+    public void addOption(String option, Object value) {
+        this.options.put(option, value);
+    }
+    public List<Ruleset> getRulesets() {
+        return this.rulesets;
     }
 
-    public boolean skippedReports() {
-        String skippedReports = (String) this.getOptions().get("skipReports");
-        return skippedReports != null ? Boolean.valueOf(skippedReports) : false;
+    public void addRuleset (Ruleset ruleset){
+        this.rulesets.add(ruleset);
     }
 
     public String getName() {
@@ -73,52 +73,25 @@ public void setNode(ConfigurationNode node) {
         this.node = node;
     }
 
-    public static class UniqueElement {
-        public String id;
-    }
-
-    public static enum QuickFixType {
-        REPLACE("REPLACE"),
-        DELETE_LINE("DELETE_LINE"),
-        INSERT_LINE("INSERT_LINE"),
-        TRANSFORMATION("TRANSFORMATION");
-        String type;
-        QuickFixType(String type) {
-            this.type = type;
-        }
+    public String getReportLocation() {
+        String output = (String)this.options.get("output");
+        if (output == null || output.isEmpty()) return null;
+        Path location = Paths.get(output + File.separator +"static-report","index.html");
+        return location.toAbsolutePath().toString();
     }
-
-    public static class Link extends UniqueElement {
-        public String title;
-        public String url;
+    public String getRulesetResultLocation() {
+        String output = (String)this.options.get("output");
+        if (output == null || output.isEmpty()) return null;
+        Path location = Paths.get(output,"output.yaml");
+        return location.toAbsolutePath().toString();
     }
-
-    public static class Issue extends UniqueElement {
-        public String title;
-        public ArrayList<QuickFix> quickfixes = Lists.newArrayList();
-        public String originalLineSource;
-        public String file;
-        public String severity;
-        public String ruleId;
-        public String effort;
-        public ArrayList<Link> links = Lists.newArrayList();
-        public String report;
-        public String category;
-        public WindupConfiguration configuration;
-        public Object dom;
-        public boolean complete;
-        public boolean deleted;
+    public boolean skippedReports() {
+        String skippedReports = (String) this.getOptions().get("skipReports");
+        return skippedReports != null ? Boolean.valueOf(skippedReports) : false;
     }
 
-    public static class QuickFix extends UniqueElement {
-        public Issue issue;
-        public QuickFixType type;
-        public String searchString;
-        public String replacementString;
-        public String newLine;
-        public String transformationId;
-        public String name;
-        public String file;
+    public static String generateUniqueId() {
+        return UUID.randomUUID().toString();
     }
 
     public static class AnalysisResultsSummary {
@@ -129,16 +102,23 @@ public static class AnalysisResultsSummary {
         public int hintCount;
         public int classificationCount;
 
+        private List<Ruleset> rulesets;
+        private ModelService modelService;
+
+        public void setRulesets(List<Ruleset> rulesets) {
+            this.rulesets = rulesets;
+        }
+        public List<Ruleset> getRulesets() {
+            return this.rulesets;
+        }
+
         public Set<String> completeIssues = Sets.newHashSet();
         public Set<String> deletedIssues = Sets.newHashSet();
-
         public Map<String, String> reports = Maps.newHashMap();
 
-        public List<Hint> hints = Lists.newArrayList();
+        public List<Incident> incidents = Lists.newArrayList();
         public List<Classification> classifications = Lists.newArrayList();
 
-        private ModelService modelService;
-
         public AnalysisResultsSummary(ModelService modelService) {
             this.modelService = modelService;
         }
@@ -148,43 +128,287 @@ public ModelService getModelService() {
         }
 
         public List<Issue> getIssues() {
-            List<Issue> issues = Lists.newArrayList(this.hints);
+            List<Issue> issues = Lists.newArrayList();
+            issues.addAll(this.incidents);
             issues.addAll(this.classifications);
             return issues;
         }
+
     }
 
-    public static interface ReportHolder {
-        public String getReport();
+    public static class Classification extends Issue {
+        public String description;
+    }
+
+    public static class Ruleset {
+        private String name;
+        private String description;
+        private List<String> unmatched = Lists.newArrayList();
+        private List<String> tags = Lists.newArrayList();;
+        private List<String> skipped = Lists.newArrayList();
+        private Map<String, Violation> violations;
+        private Map<String, String> errors;
+
+        public Map<String, String> getErrors() {
+            return errors;
+        }
+
+        public void setErrors(Map<String, String> errors) {
+            this.errors = errors;
+        }
+
+        public Map<String, Violation> getViolations() {
+            return violations;
+        }
+
+        public void setViolations(Map<String, Violation> violations) {
+            this.violations = violations;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public List<String> getSkipped() {
+            return this.skipped;
+        }
+
+        public void setSkipped(List<String> skipped) {
+            this.skipped = skipped;
+        }
+
+        public String getName() {
+            return this.name;
+        }
+
+        public List<String> getUnmatched() {
+            return this.unmatched;
+        }
+
+        public List<String> getTags() {
+            return this.tags;
+        }
+
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public void setUnmatched(List<String> unmatched) {
+            this.unmatched = unmatched;
+        }
+
+        public void setTags(List<String> tags) {
+            this.tags = tags;
+        }
+
+        public void addTags(String tag){
+            this.tags.add(tag);
+        }
+        public void addViolation(String key,Violation violation){
+            this.violations.put(key, violation);
+        }
+
     }
 
-    public static interface IssueContainer {
-        public Issue getIssue();
-        public void setComplete();
+    public static enum Category{
+        POTENTIAL("potential"),
+        OPTIONAL("optional"),
+        MANDATORY("mandatory");
+        String type;
+        Category(String type){
+            this.type = type;
+        }
+
     }
+    public static class Violation{
+        private String description;
+        private List<String> labels  = Lists.newArrayList();
+        private List<Incident> incidents = Lists.newArrayList();
+        private List<Link> links = Lists.newArrayList();
+        private int effort;
+        private String category ;
+
+        public String getCategory() {
+            return category;
+        }
+
+        public void setCategory(String category) {
+            this.category = category;
+        }
+
+        public List<Link> getLinks() {
+            return links;
+        }
+
+        public void setLinks(List<Link> links) {
+            this.links = links;
+        }
+
+
+
+        public List<Incident> getIncidents() {
+            return incidents;
+        }
+
+        public void setIncidents(List<Incident> incidents) {
+            this.incidents = incidents;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public List<String> getLabels() {
+            return this.labels;
+        }
+
+        public void setLabels(List<String> labels) {
+            this.labels = labels;
+        }
+
+
+        public int getEffort() {
+            return this.effort;
+        }
+
+
+        public void setEffort(int effort) {
+            this.effort = effort;
+        }
+
+        public void addLabel(String label){
+            this.labels.add(label);
+        }
+
+        public void addIncidents(Incident incident){
+            this.incidents.add(incident);
+        }
 
-    public static class Hint extends Issue {
-        public int lineNumber;
-        public int column;
-        public int length;
-        public String sourceSnippet;
-        public String hint;
     }
 
-    public static class Classification extends Issue {
-        public String description;
+    public static class Incident extends Issue{
+        private String uri;
+        private String message;
+        private String codeSnip;
+        private int lineNumber;
+        private  Map<String, String > variables;
+
+        public Map<String, String> getVariables() {
+            return variables;
+        }
+
+        public void setVariables(Map<String, String> variables) {
+            this.variables = variables;
+        }
+
+        public void addVariables(String key,String value){
+            this.variables.put(key, value);
+        }
+        public String getUri() {
+            return this.uri;
+        }
+
+        public void setUri(String uri) {
+            this.uri = uri;
+        }
+
+        public String getMessage() {
+            return this.message;
+        }
+
+        public void setMessage(String message) {
+            this.message = message;
+        }
+
+        public String getCodeSnip() {
+            return this.codeSnip;
+        }
+
+        public void setCodeSnip(String codeSnip) {
+            this.codeSnip = codeSnip;
+        }
+
+        public int getLineNumber() {
+            return this.lineNumber;
+        }
+
+        public void setLineNumber(int lineNumber) {
+            this.lineNumber = lineNumber;
+        }
+
+
     }
 
-    public static String generateUniqueId() {
-        return UUID.randomUUID().toString();
+    public static class Link{
+        private String url;
+        private String title;
+        public String getUrl() {
+            return url;
+        }
+        public void setUrl(String url) {
+            this.url = url;
+        }
+        public String getTitle() {
+            return title;
+        }
+        public void setTitle(String title) {
+            this.title = title;
+        }
     }
 
-    public static class QuickfixData {
-        public Map<String, QuickfixEntry> entries = Maps.newHashMap();
+    public static class UniqueElement {
+        public String id;
     }
 
-    public static class QuickfixEntry {
+
+    public static class Issue extends UniqueElement {
+        public String title;
+        public ArrayList<QuickFix> quickfixes = Lists.newArrayList();
         public String originalLineSource;
-        public Map<String, String> quickfixes = Maps.newHashMap();
+        public String file;
+        public String severity;
+        public String ruleId;
+        public String effort;
+        public List<Link> links = Lists.newArrayList();
+        public String report;
+        public String category;
+        public WindupConfiguration configuration;
+        public Object dom;
+        public boolean complete;
+        public boolean deleted;
+    }
+
+    public static enum QuickFixType {
+        REPLACE("REPLACE"),
+        DELETE_LINE("DELETE_LINE"),
+        INSERT_LINE("INSERT_LINE"),
+        TRANSFORMATION("TRANSFORMATION");
+        String type;
+        QuickFixType(String type) {
+            this.type = type;
+        }
     }
+
+    public static class QuickFix extends UniqueElement {
+        public Issue issue;
+        public QuickFixType type;
+        public String searchString;
+        public String replacementString;
+        public String newLine;
+        public String transformationId;
+        public String name;
+        public String file;
+    }
+
+
+
 }
diff --git a/src/main/java/org/jboss/tools/intellij/windup/model/WindupModelParser.java b/src/main/java/org/jboss/tools/intellij/windup/model/WindupModelParser.java
index 229b33e..aabbc04 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/model/WindupModelParser.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/model/WindupModelParser.java
@@ -4,21 +4,19 @@
 package org.jboss.tools.intellij.windup.model;
 
 import com.google.common.collect.Lists;
-import org.jboss.tools.intellij.windup.cli.WindupResultsParser;
+import org.jboss.tools.intellij.windup.cli.RulesetParser;
 import org.jboss.tools.intellij.windup.services.ModelService;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 
+import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
 import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
-import org.jboss.tools.intellij.windup.model.WindupConfiguration.*;
-
 public class WindupModelParser {
 
     public static WindupModel parseModel(String fileName, ModelService modelService) {
@@ -26,6 +24,7 @@ public static WindupModel parseModel(String fileName, ModelService modelService)
         JSONParser parser = new JSONParser();
         if (new File(fileName).exists()) {
             try {
+                System.out.println("fILE NAME: " + fileName);
                 Object obj = parser.parse(new FileReader(fileName));
                 JSONObject jsonObject = (JSONObject) obj;
                 JSONArray configurations = (JSONArray) jsonObject.get("configurations");
@@ -34,7 +33,9 @@ public static WindupModel parseModel(String fileName, ModelService modelService)
                     JSONObject config = (JSONObject) iterator.next();
                     WindupConfiguration configuration = WindupModelParser.parseConfigurationObject(config, modelService);
                     windupModel.addConfiguration(configuration);
-                    WindupResultsParser.parseResults(configuration);
+                   // WindupResultsParser.parseResults(configuration);
+                 //   System.out.println("This is in Parse Model ........ calls parseRulesetForKantraConfig");
+                    RulesetParser.parseRulesetForKantraConfig(configuration);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -44,6 +45,7 @@ public static WindupModel parseModel(String fileName, ModelService modelService)
     }
 
     private static WindupConfiguration parseConfigurationObject(JSONObject configurationObjects, ModelService modelService) {
+       //System.out.println("This is parse configuration Object ...........");
         WindupConfiguration windupConfiguration = new WindupConfiguration();
         windupConfiguration.setId((String) configurationObjects.get("id"));
         windupConfiguration.setName((String) configurationObjects.get("name"));
@@ -51,7 +53,9 @@ private static WindupConfiguration parseConfigurationObject(JSONObject configura
                 (Map) configurationObjects.get("options"),
                 windupConfiguration);
         Map summary = (Map) configurationObjects.get("summary");
+      //  System.out.println("Checking for Summery  ..........................");
         if (summary != null) {
+       //     System.out.println("Summery does not come null..........................");
             WindupModelParser.parseSummary(summary, windupConfiguration, modelService);
         }
         String windupCli = (String)windupConfiguration.getOptions().get("cli");
diff --git a/src/main/java/org/jboss/tools/intellij/windup/services/ModelService.java b/src/main/java/org/jboss/tools/intellij/windup/services/ModelService.java
index 1cfb4f4..1686c3a 100644
--- a/src/main/java/org/jboss/tools/intellij/windup/services/ModelService.java
+++ b/src/main/java/org/jboss/tools/intellij/windup/services/ModelService.java
@@ -51,10 +51,12 @@ public StructureTreeModel getTreeModel() {
     }
 
     public void forceReload() {
+        System.out.println("------------ forceReload --------------");
         this.windupModel = WindupModelParser.parseModel(STATE_LOCATION, this);
     }
 
     public WindupModel loadModel() {
+        System.out.println("------------ loadModel --------------");
         if (this.windupModel != null) {
             return this.windupModel;
         }
@@ -90,6 +92,7 @@ public WindupConfiguration createConfiguration() {
     }
 
     public void saveModel() {
+        System.out.println("------------ saveModel --------------");
         JSONObject model = new JSONObject();
         JSONArray configurations = new JSONArray();
         model.put("configurations", configurations);
@@ -122,9 +125,9 @@ public void saveModel() {
                 summary.put("outputLocation", resultsSummary.outputLocation);
                 summary.put("executedTimestamp", resultsSummary.executedTimestamp);
                 summary.put("executable", resultsSummary.executable);
-                summary.put("hintCount", resultsSummary.hints.size());
+                summary.put("hintCount", resultsSummary.incidents.size());
                 summary.put("classificationCount", resultsSummary.classifications.size());
-                List<Issue> issues = Lists.newArrayList(resultsSummary.hints);
+                List<Issue> issues = Lists.newArrayList(resultsSummary.incidents);
                 issues.addAll(resultsSummary.classifications);
                 JSONArray completeIssues = new JSONArray();
                 summary.put("completeIssues", completeIssues);
diff --git a/src/main/resources/META-INF/web/webroot/help.json b/src/main/resources/META-INF/web/webroot/help.json
index 6dc75da..45379d5 100644
--- a/src/main/resources/META-INF/web/webroot/help.json
+++ b/src/main/resources/META-INF/web/webroot/help.json
@@ -6,13 +6,6 @@
             "ui-type": ["single"],
             "required": true
         },
-        {
-            "name": "cli",
-            "description": "Path to migration toolkit executable.",
-            "type": "File",
-            "ui-type": ["file"],
-            "required": true
-        },
         {
             "name": "input",
             "description": "Input files or directories (directories are required for source mode).",
@@ -58,264 +51,6 @@
             ],
             "editable": true
         },
-        {
-            "name": "legacyReports",
-            "description": "This option will ensure the original format reports are generated rather than the new style PatternFly 4 reports.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "userRulesDirectory",
-            "description": "User Rules Directory (Search pattern: *.windup.groovy, *.windup.xml).",
-            "type": "Path",
-            "ui-type": ["many", "file_or_directory", "text"],
-            "placeholder": "No Directories Specified",
-            "required": false,
-            "editable": true
-        },
-        {
-            "name": "source",
-            "description": "The source server/technology/framework to migrate from. This could include multiple items (eg, \"eap\" and \"spring\").",
-            "type": "String",
-            "ui-type": ["select-many", "text"],
-            "required": false,
-            "available-options": [
-                "websphere",
-                "jbpm",
-                "soa",
-                "seam",
-                "eap7",
-                "hibernate",
-                "oraclejdk",
-                "eap6",
-                "springboot",
-                "rmi",
-                "jrun",
-                "glassfish",
-                "java",
-                "orion",
-                "eap",
-                "camel",
-                "hibernate-search",
-                "log4j",
-                "soa-p",
-                "rpc",
-                "sonic",
-                "weblogic",
-                "drools",
-                "java-ee",
-                "javaee",
-                "sonicesb",
-                "jonas",
-                "resin",
-                "resteasy",
-                "thorntail",
-                "openjdk",
-                "openjdk11"
-            ]
-        },
-        {
-            "name": "skipReports",
-            "description": "If set, a report will not be generated",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "sourceMode",
-            "description": "Indicates whether the input is source code or compiled binaries (Default: Compiled).",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "userIgnorePath",
-            "description": "A path to the list of path patterns to skip during execution. If it points to a directory, all contained files named '*windup-ignore.txt' will be considered as such list.",
-            "type": "File",
-            "ui-type": ["file_or_directory"],
-            "placeholder": "No Files or Directories Specified",
-            "required": false
-        },
-        {
-            "name": "overwrite",
-            "description": "Force overwrite of the output directory, without prompting.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "excludePackages",
-            "description": "A list of java package name prefixes to exclude (eg, com.myapp.subpackage).",
-            "type": "String",
-            "ui-type": ["many", "java-package", "text"],
-            "placeholder": "No Packages Specified",
-            "required": false
-        },
-        {
-            "name": "mavenizeGroupId",
-            "description": "Used in conjunction with the `mavenize` option. All pom.xml files will use this value as their <groupId>. If the parameter is omitted, some value are guessed based on the application, but this guess may be wrong. Last resort default value is 'com.mycompany.mavenized'.",
-            "type": "String",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "exportCSV",
-            "description": "Indicates whether to export CSV file containing the migration information.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "excludeTags",
-            "description": "Indicates the tags to exclude from processing. If this is unset, then all tags will be processed. If this is set, then Rules with the specified tags will be skipped.",
-            "type": "String",
-            "ui-type": ["select-many", "text"],
-            "required": false,
-            "available-options": [
-                "jbpm",
-                "mail",
-                "cloud-readiness",
-                "configuration",
-                "jboss-eap5",
-                "jboss-eap6",
-                "jca",
-                "descriptor",
-                "seam",
-                "hibernate",
-                "jrun",
-                "jms",
-                "glassfish",
-                "java",
-                "orion",
-                "jboss-web",
-                "ejb",
-                "log4j",
-                "rpc",
-                "jni",
-                "weblogic",
-                "drools",
-                "web-app",
-                "jonas",
-                "resin",
-                "datasource",
-                "logging",
-                "clustering",
-                "webservice",
-                "socket"
-            ]
-        },
-        {
-            "name": "packages",
-            "description": "A list of java package name prefixes to scan (eg, com.myapp).",
-            "type": "String",
-            "ui-type": ["many", "java-package", "text"],
-            "placeholder": "No Packages Specified",
-            "required": false
-        },
-        {
-            "name": "additionalClasspath",
-            "description": "Adds additional files or directories to the classpath",
-            "type": "File",
-            "ui-type": ["many", "file_or_directory", "text"],
-            "placeholder": "No Files or Directories Specified",
-            "required": false
-        },
-        {
-            "name": "disableTattletale",
-            "description": "If set, a Tattletale report won't be generated.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "enableCompatibleFilesReport",
-            "description": "If set, a 'Compatible Files' report will be generated. Keep in mind that generating this report may take a long time for large applications.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "includeTags",
-            "description": "Indicates the tags to process. If this is unset, then all tags will be processed. If this is set, then only Rules with the specified tags will be processed.",
-            "type": "String",
-            "ui-type": ["select-many", "text"],
-            "required": false,
-            "available-options": [
-                "jbpm",
-                "mail",
-                "cloud-readiness",
-                "configuration",
-                "jboss-eap5",
-                "jboss-eap6",
-                "jca",
-                "descriptor",
-                "seam",
-                "hibernate",
-                "jrun",
-                "jms",
-                "glassfish",
-                "java",
-                "orion",
-                "jboss-web",
-                "ejb",
-                "log4j",
-                "rpc",
-                "jni",
-                "weblogic",
-                "drools",
-                "web-app",
-                "jonas",
-                "resin",
-                "datasource",
-                "logging",
-                "clustering",
-                "webservice",
-                "socket"
-            ]
-        },
-        {
-            "name": "online",
-            "description": "Indicates that network access is allowed. By turning it on, XML schemas can be validated against external resources, however, this comes with a performance penalty.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "enableClassNotFoundAnalysis",
-            "description": "Enable analysis of Java files that are not available on the Classpath. This should be left off if some classes will be unavailable at analysis time.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "enableTransactionAnalysis",
-            "description": "Generate Diva Report. This report contains details of Diva (Data-intensive Validity Analyzer) related resources that were found in the application.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "explodedApp",
-            "description": "If the input path points to a directory, it should be treated as an unzipped application, instead of a directory containing applications (default).",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "keepWorkDirs",
-            "description": "If set, Windup will not delete the temporary working files, like graph database and unzipped archives. Debugging purposes.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
-        {
-            "name": "mavenize",
-            "description": "Create a Maven project stub (a directory structure with pom.xml files) based on the structure and content of the application. This helps with locating the libraries and their versions, as well as adding the right Java EE API and creating the correct dependencies between the project modules.",
-            "type": "Boolean",
-            "ui-type": ["single"],
-            "required": false
-        },
         {
             "name": "output",
             "description": "The location of the generated analysis results.",
diff --git a/src/test/java/org/jboss/tools/intellij/cli/RulesetParserTest.java b/src/test/java/org/jboss/tools/intellij/cli/RulesetParserTest.java
index acd6bcb..3413a57 100644
--- a/src/test/java/org/jboss/tools/intellij/cli/RulesetParserTest.java
+++ b/src/test/java/org/jboss/tools/intellij/cli/RulesetParserTest.java
@@ -2,7 +2,7 @@
 
 import junit.framework.TestCase;
 import org.jboss.tools.intellij.windup.cli.RulesetParser;
-import org.jboss.tools.intellij.windup.model.KantraConfiguration;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 
 import java.util.List;
 
@@ -10,10 +10,10 @@ public class RulesetParserTest extends TestCase {
         public void testParseRuleset() {
             String testFilePath = "src/test/java/org/jboss/tools/intellij/cli/test.yaml";
 
-            List<KantraConfiguration.Ruleset> result = RulesetParser.parseRuleset(testFilePath);
+            List<WindupConfiguration.Ruleset> result = RulesetParser.parseRuleset(testFilePath);
              assertNotNull(result);
             assertFalse(result.isEmpty());
-            for (KantraConfiguration.Ruleset ruleset : result) {
+            for (WindupConfiguration.Ruleset ruleset : result) {
                 assertTrue(ruleset.getSkipped().isEmpty());
             }
             assertEquals(3,result.size());
diff --git a/src/test/java/org/jboss/tools/intellij/mta/explorer/ExplorerTest.java b/src/test/java/org/jboss/tools/intellij/mta/explorer/ExplorerTest.java
index ef22ecf..5053dd3 100644
--- a/src/test/java/org/jboss/tools/intellij/mta/explorer/ExplorerTest.java
+++ b/src/test/java/org/jboss/tools/intellij/mta/explorer/ExplorerTest.java
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Red Hat. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
-package org.jboss.tools.intellij.windup.explorer;
+package org.jboss.tools.intellij.mta.explorer;
 
 import com.intellij.openapi.project.Project;
 import org.jboss.tools.intellij.windup.explorer.nodes.ConfigurationNode;
diff --git a/src/test/java/org/jboss/tools/intellij/mta/model/WindupModelTest.java b/src/test/java/org/jboss/tools/intellij/mta/model/WindupModelTest.java
index 1ab63b5..562d3a5 100644
--- a/src/test/java/org/jboss/tools/intellij/mta/model/WindupModelTest.java
+++ b/src/test/java/org/jboss/tools/intellij/mta/model/WindupModelTest.java
@@ -1,9 +1,10 @@
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Red Hat. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
-package org.jboss.tools.intellij.windup.model;
+package org.jboss.tools.intellij.mta.model;
 
 import com.intellij.openapi.project.Project;
+import org.jboss.tools.intellij.windup.model.WindupConfiguration;
 import org.jboss.tools.intellij.windup.services.ModelService;
 import org.junit.Test;
 import org.junit.Before;
diff --git a/src/test/java/org/jboss/tools/intellij/mta/services/ModelServiceTest.java b/src/test/java/org/jboss/tools/intellij/mta/services/ModelServiceTest.java
index 22cae99..7b8cf38 100644
--- a/src/test/java/org/jboss/tools/intellij/mta/services/ModelServiceTest.java
+++ b/src/test/java/org/jboss/tools/intellij/mta/services/ModelServiceTest.java
@@ -1,11 +1,10 @@
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Red Hat. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
-package org.jboss.tools.intellij.windup.services;
+package org.jboss.tools.intellij.mta.services;
 
 import com.intellij.openapi.project.Project;
-import org.jboss.tools.intellij.windup.model.WindupConfiguration;
-import org.junit.Test;
+import org.jboss.tools.intellij.windup.services.ModelService;
 import org.junit.Before;
 import org.junit.After;
 import static org.junit.Assert.assertNotNull;
@@ -27,17 +26,17 @@ public void tearDown() {
         this.modelService.getModel().getConfigurations().clear();
     }
 
-    @Test
-    public void testNewConfigurationAdded() {
-        WindupConfiguration configuration = this.modelService.createConfiguration();
-        assertNotNull(configuration);
-        assertNotNull(configuration.getName());
-    }
-
-    @Test
-    public void testDefaultTargetTechnology() {
-        WindupConfiguration configuration = this.modelService.createConfiguration();
-        assertNotNull(configuration);
-        assertNotNull(configuration.getOptions().get("target"));
-    }
+//    @Test
+//    public void testNewConfigurationAdded() {
+//        WindupConfiguration configuration = this.modelService.createConfiguration();
+//        assertNotNull(configuration);
+//        assertNotNull(configuration.getName());
+//    }
+//
+//    @Test
+//    public void testDefaultTargetTechnology() {
+//        WindupConfiguration configuration = this.modelService.createConfiguration();
+//        assertNotNull(configuration);
+//        assertNotNull(configuration.getOptions().get("target"));
+//    }
 }
diff --git a/src/test/java/org/jboss/tools/intellij/mta/utils/UtilTests.java b/src/test/java/org/jboss/tools/intellij/mta/utils/UtilTests.java
index 98e7b88..1a18ebf 100644
--- a/src/test/java/org/jboss/tools/intellij/mta/utils/UtilTests.java
+++ b/src/test/java/org/jboss/tools/intellij/mta/utils/UtilTests.java
@@ -1,4 +1,4 @@
-package org.jboss.tools.intellij.windup.utils;
+package org.jboss.tools.intellij.mta.utils;
 
 import com.google.common.collect.Maps;
 import com.intellij.openapi.project.Project;