diff --git a/diff2html.js b/diff2html.js
deleted file mode 100644
index 435a6cff..00000000
--- a/diff2html.js
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- *
- * Diff to HTML (diff2html.js)
- * Author: rtfpessoa
- *
- * Diff commands:
- *   git diff
- */
-
-var LINE_TYPE = {
-    INSERTS: "d2h-ins",
-    DELETES: "d2h-del",
-    CONTEXT: "d2h-cntx",
-    INFO: "d2h-info"
-};
-
-function Diff2Html() {
-}
-
-/*
- * Generates pretty html from string diff input
- */
-Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
-    var diffJson = generateDiffJson(diffInput);
-    return generateJsonHtml(diffJson);
-};
-
-/*
- * Generates json object from string diff input
- */
-Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
-    return generateDiffJson(diffInput);
-};
-
-/*
- * Generates pretty html from a json object
- */
-Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
-    return generateJsonHtml(diffJson);
-};
-
-/*
- * Generates pretty side by side html from string diff input
- */
-Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput) {
-    var diffJson = generateDiffJson(diffInput);
-    return generateSideBySideJsonHtml(diffJson);
-};
-
-/*
- * Generates pretty side by side html from a json object
- */
-Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
-    return generateSideBySideJsonHtml(diffJson);
-};
-
-var generateDiffJson = function (diffInput) {
-    var files = [],
-      currentFile = null,
-      currentBlock = null,
-      oldLine = null,
-      newLine = null;
-
-    var saveBlock = function () {
-        /* add previous block(if exists) before start a new file */
-        if (currentBlock) {
-            currentFile.blocks.push(currentBlock);
-            currentBlock = null;
-        }
-    };
-
-    var saveFile = function () {
-        /*
-         * add previous file(if exists) before start a new one
-         * if it has name (to avoid binary files errors)
-         */
-        if (currentFile && currentFile.newName) {
-            files.push(currentFile);
-            currentFile = null;
-        }
-    };
-
-    var startFile = function () {
-        saveBlock();
-        saveFile();
-
-        /* create file structure */
-        currentFile = {};
-        currentFile.blocks = [];
-        currentFile.deletedLines = 0;
-        currentFile.addedLines = 0;
-    };
-
-    var startBlock = function (line) {
-        saveBlock();
-
-        var values = /^@@ -(\d+),\d+ \+(\d+),\d+ @@.*/.exec(line) ||
-          /^@@@ -(\d+),\d+ -\d+,\d+ \+(\d+),\d+ @@@.*/.exec(line) ||
-          [0, 0, 0];
-
-        oldLine = values[1];
-        newLine = values[2];
-
-        /* create block metadata */
-        currentBlock = {};
-        currentBlock.lines = [];
-        currentBlock.oldStartLine = oldLine;
-        currentBlock.newStartLine = newLine;
-        currentBlock.header = line;
-    };
-
-    var createLine = function (line) {
-        var currentLine = {};
-        currentLine.content = line;
-
-        /* fill the line data */
-        if (startsWith(line, "+") || startsWith(line, " +")) {
-            currentFile.addedLines++;
-
-            currentLine.type = LINE_TYPE.INSERTS;
-            currentLine.oldNumber = null;
-            currentLine.newNumber = newLine++;
-
-            currentBlock.lines.push(currentLine);
-
-        } else if (startsWith(line, "-") || startsWith(line, " -")) {
-            currentFile.deletedLines++;
-
-            currentLine.type = LINE_TYPE.DELETES;
-            currentLine.oldNumber = oldLine++;
-            currentLine.newNumber = null;
-
-            currentBlock.lines.push(currentLine);
-
-        } else {
-            currentLine.type = LINE_TYPE.CONTEXT;
-            currentLine.oldNumber = oldLine++;
-            currentLine.newNumber = newLine++;
-
-            currentBlock.lines.push(currentLine);
-        }
-    };
-
-    var diffLines = diffInput.split("\n");
-    diffLines.forEach(function (line) {
-        // Unmerged paths, and possibly other non-diffable files
-        // https://github.com/scottgonzalez/pretty-diff/issues/11
-        // Also, remove some useless lines
-        if (!line || startsWith(line, "*") ||
-          startsWith(line, "new") || startsWith(line, "index")) {
-            return;
-        }
-
-        var values = [];
-        if (startsWith(line, "diff")) {
-            startFile();
-        } else if (currentFile && !currentFile.oldName && (values = /^--- a\/(\S+).*$/.exec(line))) {
-            currentFile.oldName = values[1];
-        } else if (currentFile && !currentFile.newName && (values = /^\+\+\+ [b]?\/(\S+).*$/.exec(line))) {
-            currentFile.newName = values[1];
-
-            var fileSplit = currentFile.newName.split(".");
-            currentFile.language = fileSplit[fileSplit.length - 1];
-        } else if (currentFile && startsWith(line, "@@")) {
-            startBlock(line);
-        } else if (currentBlock) {
-            createLine(line);
-        }
-    });
-
-    saveBlock();
-    saveFile();
-
-    return files;
-};
-
-/*
- * Line By Line HTML
- */
-
-var generateJsonHtml = function (diffFiles) {
-    return "<div class=\"d2h-wrapper\">\n" +
-      diffFiles.map(function (file) {
-          return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
-            "     <div class=\"d2h-file-header\">\n" +
-            "       <div class=\"d2h-file-stats\">\n" +
-            "         <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
-            "         <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
-            "       </div>\n" +
-            "       <div class=\"d2h-file-name\">" + getDiffName(file.oldName, file.newName) + "</div>\n" +
-            "     </div>\n" +
-            "     <div class=\"d2h-file-diff\">\n" +
-            "       <div class=\"d2h-code-wrapper\">\n" +
-            "         <table class=\"d2h-diff-table\">\n" +
-            "           <tbody class=\"d2h-diff-tbody\">\n" +
-            "         " + generateFileHtml(file) +
-            "           </tbody>\n" +
-            "         </table>\n" +
-            "       </div>\n" +
-            "     </div>\n" +
-            "   </div>\n";
-      }).join("\n") +
-      "</div>\n";
-};
-
-var generateFileHtml = function (file) {
-    return file.blocks.map(function (block) {
-
-        var lines = "<tr>\n" +
-          "  <td class=\"d2h-code-linenumber " + LINE_TYPE.INFO + "\"></td>\n" +
-          "  <td class=\"" + LINE_TYPE.INFO + "\">" +
-          "    <div class=\"d2h-code-line " + LINE_TYPE.INFO + "\">" + escape(block.header) + "</div>" +
-          "  </td>\n" +
-          "</tr>\n";
-
-        for (var i = 0; i < block.lines.length; i++) {
-            var prevLine = block.lines[i - 1];
-            var line = block.lines[i];
-            var newLine = block.lines[i + 1];
-            var nextNewLine = block.lines[i + 2];
-
-            var isOppositeTypeTwoLineBlock =
-              line.type == LINE_TYPE.DELETES &&
-              newLine && newLine.type == LINE_TYPE.INSERTS &&
-              (!nextNewLine || nextNewLine && nextNewLine.type != LINE_TYPE.INSERTS) &&
-              (!prevLine || prevLine && prevLine.type != LINE_TYPE.DELETES);
-
-            var escapedLine = escape(line.content);
-
-            if (isOppositeTypeTwoLineBlock) {
-                var nextEscapedLine = escape(newLine.content);
-
-                var diff = diffHighlight(escapedLine, nextEscapedLine);
-
-                lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, diff.o) +
-                generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, diff.n);
-
-                i++;
-            } else {
-                lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
-            }
-        }
-
-        return lines;
-    }).join("\n");
-};
-
-var generateLineHtml = function (type, oldNumber, newNumber, content) {
-    return "<tr>\n" +
-      "  <td class=\"d2h-code-linenumber " + type + "\">" +
-      "    <div class=\"line-num1\">" + valueOrEmpty(oldNumber) + "</div>" +
-      "    <div class=\"line-num2\">" + valueOrEmpty(newNumber) + "</div>" +
-      "  </td>\n" +
-      "  <td class=\"" + type + "\">" +
-      "    <div class=\"d2h-code-line " + type + "\">" + content + "</div>" +
-      "  </td>\n" +
-      "</tr>\n";
-};
-
-/*
- * Side By Side HTML (work in progress)
- */
-
-var generateSideBySideJsonHtml = function (diffFiles) {
-    return "<div class=\"d2h-wrapper\">\n" +
-      diffFiles.map(function (file) {
-          var diffs = generateSideBySideFileHtml(file);
-
-          return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
-            "     <div class=\"d2h-file-header\">\n" +
-            "       <div class=\"d2h-file-stats\">\n" +
-            "         <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
-            "         <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
-            "       </div>\n" +
-            "       <div class=\"d2h-file-name\">" + getDiffName(file.oldName, file.newName) + "</div>\n" +
-            "     </div>\n" +
-            "     <div class=\"d2h-files-diff\">\n" +
-            "       <div class=\"d2h-file-side-diff\">\n" +
-            "         <div class=\"d2h-code-wrapper\">\n" +
-            "           <table class=\"d2h-diff-table\">\n" +
-            "             <tbody class=\"d2h-diff-tbody\">\n" +
-            "           " + diffs.left +
-            "             </tbody>\n" +
-            "           </table>\n" +
-            "         </div>\n" +
-            "       </div>\n" +
-            "       <div class=\"d2h-file-side-diff\">\n" +
-            "         <div class=\"d2h-code-wrapper\">\n" +
-            "           <table class=\"d2h-diff-table\">\n" +
-            "             <tbody class=\"d2h-diff-tbody\">\n" +
-            "           " + diffs.right +
-            "             </tbody>\n" +
-            "           </table>\n" +
-            "         </div>\n" +
-            "       </div>\n" +
-            "     </div>\n" +
-            "   </div>\n";
-      }).join("\n") +
-      "</div>\n";
-};
-
-var generateSideBySideFileHtml = function (file) {
-    var fileHtml = {};
-    fileHtml.left = "";
-    fileHtml.right = "";
-
-    file.blocks.forEach(function (block) {
-
-        fileHtml.left += "<tr>\n" +
-        "  <td class=\"d2h-code-side-linenumber " + LINE_TYPE.INFO + "\"></td>\n" +
-        "  <td class=\"" + LINE_TYPE.INFO + "\">" +
-        "    <div class=\"d2h-code-side-line " + LINE_TYPE.INFO + "\">" + escape(block.header) + "</div>" +
-        "  </td>\n" +
-        "</tr>\n";
-
-        fileHtml.right += "<tr>\n" +
-        "  <td class=\"d2h-code-side-linenumber " + LINE_TYPE.INFO + "\"></td>\n" +
-        "  <td class=\"" + LINE_TYPE.INFO + "\">" +
-        "    <div class=\"d2h-code-side-line " + LINE_TYPE.INFO + "\"></div>" +
-        "  </td>\n" +
-        "</tr>\n";
-
-        for (var i = 0; i < block.lines.length; i++) {
-            var prevLine = block.lines[i - 1];
-            var line = block.lines[i];
-            var newLine = block.lines[i + 1];
-            var nextNewLine = block.lines[i + 2];
-
-            var isOpositeTypeTwoLineBlock = line.type == LINE_TYPE.DELETES && newLine && newLine.type == LINE_TYPE.INSERTS &&
-              (!nextNewLine || nextNewLine && nextNewLine.type != LINE_TYPE.INSERTS) &&
-              (!prevLine || prevLine && prevLine.type != LINE_TYPE.DELETES);
-
-            var escapedLine = escape(line.content);
-
-            if (isOpositeTypeTwoLineBlock) {
-                var nextEscapedLine = escape(newLine.content);
-
-                var diff = diffHighlight(escapedLine, nextEscapedLine);
-
-                fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, diff.o);
-                fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.n);
-
-                i++;
-            } else if (line.type == LINE_TYPE.DELETES) {
-                fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
-                fileHtml.right += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", "");
-            } else if (line.type == LINE_TYPE.INSERTS) {
-                fileHtml.left += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", "");
-                fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
-            } else {
-                fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
-                fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
-            }
-        }
-
-    });
-
-    return fileHtml;
-};
-
-var generateSingleLineHtml = function (type, number, content) {
-    return "<tr>\n" +
-      "    <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
-      "    <td class=\"" + type + "\">" +
-      "      <div class=\"d2h-code-side-line " + type + "\">" + content + "</div>" +
-      "    </td>\n" +
-      "  </tr>\n";
-};
-
-/*
- * HTML Helpers
- */
-
-var getDiffName = function (oldFilename, newFilename) {
-    if (oldFilename && newFilename && oldFilename !== newFilename) {
-        return oldFilename + " -> " + newFilename;
-    } else if (newFilename) {
-        return newFilename;
-    } else if (oldFilename) {
-        return oldFilename;
-    } else {
-        return "Unknown filename";
-    }
-};
-
-var removeIns = function (line) {
-    return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
-};
-
-var removeDel = function (line) {
-    return line.replace(/(<del>((.|\n)*?)<\/del>)/g, "");
-};
-
-/*
- * Utils
- */
-
-function escape(str) {
-    return str.slice(0)
-      .replace(/&/g, "&amp;")
-      .replace(/</g, "&lt;")
-      .replace(/>/g, "&gt;")
-      .replace(/\t/g, "    ");
-}
-
-function startsWith(str, start) {
-    return str.indexOf(start) === 0;
-}
-
-function valueOrEmpty(value) {
-    return value ? value : "";
-}
-
-function diffHighlight(diffLine1, diffLine2) {
-    /* remove the initial -/+ to avoid always having diff in the first char */
-    var highlightedLine = JsDiff(diffLine1.substr(1), diffLine2.substr(1));
-
-    return {
-        o: diffLine1.charAt(0) + removeIns(highlightedLine),
-        n: diffLine2.charAt(0) + removeDel(highlightedLine)
-    }
-}
diff --git a/diff2html.min.css b/diff2html.min.css
deleted file mode 100644
index 7f7ce1b6..00000000
--- a/diff2html.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.d2h-wrapper{display:block;margin:0 auto;text-align:left;width:100%}.d2h-file-wrapper{border:1px solid #ddd;border-radius:3px;margin-bottom:1em}.d2h-file-header{padding:5px 10px;border-bottom:1px solid #d8d8d8;background-color:#f7f7f7;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-stats{display:inline;font-size:12px;text-align:center;max-width:15%}.d2h-lines-added{background-color:#ceffce;border:1px solid #b4e2b4;color:#399839;border-radius:5px 0 0 5px;padding:2px;width:25px}.d2h-lines-deleted{background-color:#f7c8c8;border:1px solid #e9aeae;color:#c33;border-radius:0 5px 5px 0;padding:2px;width:25px}.d2h-file-name{display:inline;height:33px;line-height:33px;max-width:80%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.d2h-diff-table{border-collapse:collapse;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:12px;height:18px;line-height:18px;width:100%}.d2h-files-diff{width:100%}.d2h-file-diff{overflow-x:scroll}.d2h-file-side-diff{display:inline-block;overflow-x:scroll;width:50%;margin-right:-4px}.d2h-code-line{display:block;white-space:pre;padding:0 10px;height:18px;line-height:18px;margin-left:80px;color:inherit;overflow-x:inherit;background:0 0}.d2h-code-side-line.hljs{display:block;white-space:pre;padding:0 10px;height:18px;line-height:18px;margin-left:50px;color:inherit;overflow-x:inherit;background:0 0}.d2h-code-line del,.d2h-code-side-line del{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#ffb6ba;border-radius:.2em}.d2h-code-line ins,.d2h-code-side-line ins{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#97f295;border-radius:.2em}.line-num1{display:inline-block;float:left;width:30px;overflow:hidden;text-overflow:ellipsis}.line-num2{display:inline-block;float:right;width:30px;overflow:hidden;text-overflow:ellipsis}.d2h-code-linenumber{position:absolute;width:2%;min-width:65px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px;cursor:pointer}.d2h-code-side-linenumber{position:absolute;width:35px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px;cursor:pointer;overflow:hidden;text-overflow:ellipsis}.d2h-del{background-color:#fee8e9;border-color:#e9aeae}.d2h-ins{background-color:#dfd;border-color:#b4e2b4}.d2h-info{background-color:#f8fafd;color:rgba(0,0,0,.3);border-color:#d5e4f2}
\ No newline at end of file
diff --git a/diff2html.min.js b/diff2html.min.js
deleted file mode 100644
index a35f90ac..00000000
--- a/diff2html.min.js
+++ /dev/null
@@ -1 +0,0 @@
-function Diff2Html(){}function escape(str){return str.slice(0).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/\t/g,"    ")}function startsWith(str,start){return 0===str.indexOf(start)}function valueOrEmpty(value){return value?value:""}function diffHighlight(diffLine1,diffLine2){var highlightedLine=JsDiff(diffLine1.substr(1),diffLine2.substr(1));return{o:diffLine1.charAt(0)+removeIns(highlightedLine),n:diffLine2.charAt(0)+removeDel(highlightedLine)}}var LINE_TYPE={INSERTS:"d2h-ins",DELETES:"d2h-del",CONTEXT:"d2h-cntx",INFO:"d2h-info"};Diff2Html.prototype.getPrettyHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateJsonHtml(diffJson)},Diff2Html.prototype.getJsonFromDiff=function(diffInput){return generateDiffJson(diffInput)},Diff2Html.prototype.getPrettyHtmlFromJson=function(diffJson){return generateJsonHtml(diffJson)},Diff2Html.prototype.getPrettySideBySideHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateSideBySideJsonHtml(diffJson)},Diff2Html.prototype.getPrettySideBySideHtmlFromJson=function(diffJson){return generateSideBySideJsonHtml(diffJson)};var generateDiffJson=function(diffInput){var files=[],currentFile=null,currentBlock=null,oldLine=null,newLine=null,saveBlock=function(){currentBlock&&(currentFile.blocks.push(currentBlock),currentBlock=null)},saveFile=function(){currentFile&&currentFile.newName&&(files.push(currentFile),currentFile=null)},startFile=function(){saveBlock(),saveFile(),currentFile={},currentFile.blocks=[],currentFile.deletedLines=0,currentFile.addedLines=0},startBlock=function(line){saveBlock();var values=/^@@ -(\d+),\d+ \+(\d+),\d+ @@.*/.exec(line)||/^@@@ -(\d+),\d+ -\d+,\d+ \+(\d+),\d+ @@@.*/.exec(line)||[0,0,0];oldLine=values[1],newLine=values[2],currentBlock={},currentBlock.lines=[],currentBlock.oldStartLine=oldLine,currentBlock.newStartLine=newLine,currentBlock.header=line},createLine=function(line){var currentLine={};currentLine.content=line,startsWith(line,"+")||startsWith(line," +")?(currentFile.addedLines++,currentLine.type=LINE_TYPE.INSERTS,currentLine.oldNumber=null,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):startsWith(line,"-")||startsWith(line," -")?(currentFile.deletedLines++,currentLine.type=LINE_TYPE.DELETES,currentLine.oldNumber=oldLine++,currentLine.newNumber=null,currentBlock.lines.push(currentLine)):(currentLine.type=LINE_TYPE.CONTEXT,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine))},diffLines=diffInput.split("\n");return diffLines.forEach(function(line){if(line&&!startsWith(line,"*")&&!startsWith(line,"new")&&!startsWith(line,"index")){var values=[];if(startsWith(line,"diff"))startFile();else if(currentFile&&!currentFile.oldName&&(values=/^--- a\/(\S+).*$/.exec(line)))currentFile.oldName=values[1];else if(currentFile&&!currentFile.newName&&(values=/^\+\+\+ [b]?\/(\S+).*$/.exec(line))){currentFile.newName=values[1];var fileSplit=currentFile.newName.split(".");currentFile.language=fileSplit[fileSplit.length-1]}else currentFile&&startsWith(line,"@@")?startBlock(line):currentBlock&&createLine(line)}}),saveBlock(),saveFile(),files},generateJsonHtml=function(diffFiles){return'<div class="d2h-wrapper">\n'+diffFiles.map(function(file){return'<div class="d2h-file-wrapper" data-lang="'+file.language+'">\n     <div class="d2h-file-header">\n       <div class="d2h-file-stats">\n         <span class="d2h-lines-added">+'+file.addedLines+'</span>\n         <span class="d2h-lines-deleted">-'+file.deletedLines+'</span>\n       </div>\n       <div class="d2h-file-name">'+getDiffName(file.oldName,file.newName)+'</div>\n     </div>\n     <div class="d2h-file-diff">\n       <div class="d2h-code-wrapper">\n         <table class="d2h-diff-table">\n           <tbody class="d2h-diff-tbody">\n         '+generateFileHtml(file)+"           </tbody>\n         </table>\n       </div>\n     </div>\n   </div>\n"}).join("\n")+"</div>\n"},generateFileHtml=function(file){return file.blocks.map(function(block){for(var lines='<tr>\n  <td class="d2h-code-linenumber '+LINE_TYPE.INFO+'"></td>\n  <td class="'+LINE_TYPE.INFO+'">    <div class="d2h-code-line '+LINE_TYPE.INFO+'">'+escape(block.header)+"</div>  </td>\n</tr>\n",i=0;i<block.lines.length;i++){var prevLine=block.lines[i-1],line=block.lines[i],newLine=block.lines[i+1],nextNewLine=block.lines[i+2],isOppositeTypeTwoLineBlock=line.type==LINE_TYPE.DELETES&&newLine&&newLine.type==LINE_TYPE.INSERTS&&(!nextNewLine||nextNewLine&&nextNewLine.type!=LINE_TYPE.INSERTS)&&(!prevLine||prevLine&&prevLine.type!=LINE_TYPE.DELETES),escapedLine=escape(line.content);if(isOppositeTypeTwoLineBlock){var nextEscapedLine=escape(newLine.content),diff=diffHighlight(escapedLine,nextEscapedLine);lines+=generateLineHtml(line.type,line.oldNumber,line.newNumber,diff.o)+generateLineHtml(newLine.type,newLine.oldNumber,newLine.newNumber,diff.n),i++}else lines+=generateLineHtml(line.type,line.oldNumber,line.newNumber,escapedLine)}return lines}).join("\n")},generateLineHtml=function(type,oldNumber,newNumber,content){return'<tr>\n  <td class="d2h-code-linenumber '+type+'">    <div class="line-num1">'+valueOrEmpty(oldNumber)+'</div>    <div class="line-num2">'+valueOrEmpty(newNumber)+'</div>  </td>\n  <td class="'+type+'">    <div class="d2h-code-line '+type+'">'+content+"</div>  </td>\n</tr>\n"},generateSideBySideJsonHtml=function(diffFiles){return'<div class="d2h-wrapper">\n'+diffFiles.map(function(file){var diffs=generateSideBySideFileHtml(file);return'<div class="d2h-file-wrapper" data-lang="'+file.language+'">\n     <div class="d2h-file-header">\n       <div class="d2h-file-stats">\n         <span class="d2h-lines-added">+'+file.addedLines+'</span>\n         <span class="d2h-lines-deleted">-'+file.deletedLines+'</span>\n       </div>\n       <div class="d2h-file-name">'+getDiffName(file.oldName,file.newName)+'</div>\n     </div>\n     <div class="d2h-files-diff">\n       <div class="d2h-file-side-diff">\n         <div class="d2h-code-wrapper">\n           <table class="d2h-diff-table">\n             <tbody class="d2h-diff-tbody">\n           '+diffs.left+'             </tbody>\n           </table>\n         </div>\n       </div>\n       <div class="d2h-file-side-diff">\n         <div class="d2h-code-wrapper">\n           <table class="d2h-diff-table">\n             <tbody class="d2h-diff-tbody">\n           '+diffs.right+"             </tbody>\n           </table>\n         </div>\n       </div>\n     </div>\n   </div>\n"}).join("\n")+"</div>\n"},generateSideBySideFileHtml=function(file){var fileHtml={};return fileHtml.left="",fileHtml.right="",file.blocks.forEach(function(block){fileHtml.left+='<tr>\n  <td class="d2h-code-side-linenumber '+LINE_TYPE.INFO+'"></td>\n  <td class="'+LINE_TYPE.INFO+'">    <div class="d2h-code-side-line '+LINE_TYPE.INFO+'">'+escape(block.header)+"</div>  </td>\n</tr>\n",fileHtml.right+='<tr>\n  <td class="d2h-code-side-linenumber '+LINE_TYPE.INFO+'"></td>\n  <td class="'+LINE_TYPE.INFO+'">    <div class="d2h-code-side-line '+LINE_TYPE.INFO+'"></div>  </td>\n</tr>\n';for(var i=0;i<block.lines.length;i++){var prevLine=block.lines[i-1],line=block.lines[i],newLine=block.lines[i+1],nextNewLine=block.lines[i+2],isOpositeTypeTwoLineBlock=line.type==LINE_TYPE.DELETES&&newLine&&newLine.type==LINE_TYPE.INSERTS&&(!nextNewLine||nextNewLine&&nextNewLine.type!=LINE_TYPE.INSERTS)&&(!prevLine||prevLine&&prevLine.type!=LINE_TYPE.DELETES),escapedLine=escape(line.content);if(isOpositeTypeTwoLineBlock){var nextEscapedLine=escape(newLine.content),diff=diffHighlight(escapedLine,nextEscapedLine);fileHtml.left+=generateSingleLineHtml(line.type,line.oldNumber,diff.o),fileHtml.right+=generateSingleLineHtml(newLine.type,newLine.newNumber,diff.n),i++}else line.type==LINE_TYPE.DELETES?(fileHtml.left+=generateSingleLineHtml(line.type,line.oldNumber,escapedLine),fileHtml.right+=generateSingleLineHtml(LINE_TYPE.CONTEXT,"","","")):line.type==LINE_TYPE.INSERTS?(fileHtml.left+=generateSingleLineHtml(LINE_TYPE.CONTEXT,"","",""),fileHtml.right+=generateSingleLineHtml(line.type,line.newNumber,escapedLine)):(fileHtml.left+=generateSingleLineHtml(line.type,line.oldNumber,escapedLine),fileHtml.right+=generateSingleLineHtml(line.type,line.newNumber,escapedLine))}}),fileHtml},generateSingleLineHtml=function(type,number,content){return'<tr>\n    <td class="d2h-code-side-linenumber '+type+'">'+number+'</td>\n    <td class="'+type+'">      <div class="d2h-code-side-line '+type+'">'+content+"</div>    </td>\n  </tr>\n"},getDiffName=function(oldFilename,newFilename){return oldFilename&&newFilename&&oldFilename!==newFilename?oldFilename+" -> "+newFilename:newFilename?newFilename:oldFilename?oldFilename:"Unknown filename"},removeIns=function(line){return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g,"")},removeDel=function(line){return line.replace(/(<del>((.|\n)*?)<\/del>)/g,"")};
\ No newline at end of file
diff --git a/index.html b/index.html
index f788c02e..1ebfe860 100644
--- a/index.html
+++ b/index.html
@@ -7,18 +7,23 @@
     <!--
         Diff to HTML (template.html)
         Author: rtfpessoa
-        Date: Friday 29 August 2014
-        Last Update: Sunday 2 February 2015
     -->
 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css">
     <link rel="stylesheet" type="text/css" href="diff2html.css">
 
-
     <script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
 
-    <script type="text/javascript" src="jsdiff.js"></script>
-    <script type="text/javascript" src="diff2html.js"></script>
+    <script type="text/javascript" src="lib/diff.js"></script>
+    <script type="text/javascript" src="lib/fakeRequire.js"></script>
+
+    <script type="text/javascript" src="src/utils.js"></script>
+    <script type="text/javascript" src="src/diff-parser.js"></script>
+    <script type="text/javascript" src="src/printer-utils.js"></script>
+    <script type="text/javascript" src="src/side-by-side-printer.js"></script>
+    <script type="text/javascript" src="src/line-by-line-printer.js"></script>
+    <script type="text/javascript" src="src/html-printer.js"></script>
+    <script type="text/javascript" src="src/diff2html.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/languages/scala.min.js"></script>
     <script>
@@ -181,7 +186,7 @@
                 '-});\n';
 
         $(document).ready(function () {
-            var diff2Html = new Diff2Html();
+            var diff2Html = Diff2Html;
             var diffJson = diff2Html.getJsonFromDiff(lineDiffExample);
 
             var languages = diffJson.map(function (line) {
diff --git a/jsdiff.js b/jsdiff.js
deleted file mode 100644
index 11752785..00000000
--- a/jsdiff.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Javascript Diff Algorithm
- *  By John Resig (http://ejohn.org/)
- *  Modified by Chu Alan "sprite"
- *  Modified by Rodrigo Fernandes "rtfpessoa"
- *
- * Released under the MIT license.
- *
- * More Info:
- *  http://ejohn.org/projects/javascript-diff-algorithm/
- */
-
-function JsDiff(o, n) {
-    o = o.replace(/\s+$/, '');
-    n = n.replace(/\s+$/, '');
-
-    var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
-    var str = "";
-
-    var oSpace = o.match(/\s+/g);
-    if (oSpace == null) {
-        oSpace = ["\n"];
-    } else {
-        oSpace.push("\n");
-    }
-    var nSpace = n.match(/\s+/g);
-    if (nSpace == null) {
-        nSpace = ["\n"];
-    } else {
-        nSpace.push("\n");
-    }
-
-    if (out.n.length == 0) {
-        for (var i = 0; i < out.o.length; i++) {
-            str += '<del>' + out.o[i] + oSpace[i] + "</del>";
-        }
-    } else {
-        if (out.n[0].text == null) {
-            for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
-                str += '<del>' + out.o[n] + oSpace[n] + "</del>";
-            }
-        }
-
-        for (var i = 0; i < out.n.length; i++) {
-            if (out.n[i].text == null) {
-                str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
-            } else {
-                var pre = "";
-
-                for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
-                    pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
-                }
-                str += " " + out.n[i].text + nSpace[i] + pre;
-            }
-        }
-    }
-
-    return str;
-}
-
-function diff(o, n) {
-    var ns = new Object();
-    var os = new Object();
-
-    for (var i = 0; i < n.length; i++) {
-        if (ns[n[i]] == null)
-            ns[n[i]] = {rows: new Array(), o: null};
-        ns[n[i]].rows.push(i);
-    }
-
-    for (var i = 0; i < o.length; i++) {
-        if (os[o[i]] == null)
-            os[o[i]] = {rows: new Array(), n: null};
-        os[o[i]].rows.push(i);
-    }
-
-    for (var i in ns) {
-        if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
-            n[ns[i].rows[0]] = {text: n[ns[i].rows[0]], row: os[i].rows[0]};
-            o[os[i].rows[0]] = {text: o[os[i].rows[0]], row: ns[i].rows[0]};
-        }
-    }
-
-    for (var i = 0; i < n.length - 1; i++) {
-        if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
-          n[i + 1] == o[n[i].row + 1]) {
-            n[i + 1] = {text: n[i + 1], row: n[i].row + 1};
-            o[n[i].row + 1] = {text: o[n[i].row + 1], row: i + 1};
-        }
-    }
-
-    for (var i = n.length - 1; i > 0; i--) {
-        if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
-          n[i - 1] == o[n[i].row - 1]) {
-            n[i - 1] = {text: n[i - 1], row: n[i].row - 1};
-            o[n[i].row - 1] = {text: o[n[i].row - 1], row: i - 1};
-        }
-    }
-
-    return {o: o, n: n};
-}
diff --git a/lib/diff.js b/lib/diff.js
new file mode 100644
index 00000000..0815aeb3
--- /dev/null
+++ b/lib/diff.js
@@ -0,0 +1,565 @@
+/* See LICENSE file for terms of use */
+
+/*
+ * Text diff implementation.
+ *
+ * This library supports the following APIS:
+ * JsDiff.diffChars: Character by character diff
+ * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace
+ * JsDiff.diffLines: Line based diff
+ *
+ * JsDiff.diffCss: Diff targeted at CSS content
+ *
+ * These methods are based on the implementation proposed in
+ * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
+ * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
+ *
+ * AUTHOR: https://github.com/kpdecker/jsdiff
+ */
+(function(global, undefined) {
+
+  var JsDiff = (function() {
+    /*jshint maxparams: 5*/
+    /*istanbul ignore next*/
+    function map(arr, mapper, that) {
+      if (Array.prototype.map) {
+        return Array.prototype.map.call(arr, mapper, that);
+      }
+
+      var other = new Array(arr.length);
+
+      for (var i = 0, n = arr.length; i < n; i++) {
+        other[i] = mapper.call(that, arr[i], i, arr);
+      }
+      return other;
+    }
+    function clonePath(path) {
+      return { newPos: path.newPos, components: path.components.slice(0) };
+    }
+    function removeEmpty(array) {
+      var ret = [];
+      for (var i = 0; i < array.length; i++) {
+        if (array[i]) {
+          ret.push(array[i]);
+        }
+      }
+      return ret;
+    }
+    function escapeHTML(s) {
+      var n = s;
+      n = n.replace(/&/g, '&amp;');
+      n = n.replace(/</g, '&lt;');
+      n = n.replace(/>/g, '&gt;');
+      n = n.replace(/"/g, '&quot;');
+
+      return n;
+    }
+
+    function buildValues(components, newString, oldString, useLongestToken) {
+      var componentPos = 0,
+        componentLen = components.length,
+        newPos = 0,
+        oldPos = 0;
+
+      for (; componentPos < componentLen; componentPos++) {
+        var component = components[componentPos];
+        if (!component.removed) {
+          if (!component.added && useLongestToken) {
+            var value = newString.slice(newPos, newPos + component.count);
+            value = map(value, function(value, i) {
+              var oldValue = oldString[oldPos + i];
+              return oldValue.length > value.length ? oldValue : value;
+            });
+
+            component.value = value.join('');
+          } else {
+            component.value = newString.slice(newPos, newPos + component.count).join('');
+          }
+          newPos += component.count;
+
+          // Common case
+          if (!component.added) {
+            oldPos += component.count;
+          }
+        } else {
+          component.value = oldString.slice(oldPos, oldPos + component.count).join('');
+          oldPos += component.count;
+        }
+      }
+
+      return components;
+    }
+
+    var Diff = function(ignoreWhitespace) {
+      this.ignoreWhitespace = ignoreWhitespace;
+    };
+    Diff.prototype = {
+      diff: function(oldString, newString, callback) {
+        var self = this;
+
+        function done(value) {
+          if (callback) {
+            setTimeout(function() { callback(undefined, value); }, 0);
+            return true;
+          } else {
+            return value;
+          }
+        }
+
+        // Handle the identity case (this is due to unrolling editLength == 0
+        if (newString === oldString) {
+          return done([{ value: newString }]);
+        }
+        if (!newString) {
+          return done([{ value: oldString, removed: true }]);
+        }
+        if (!oldString) {
+          return done([{ value: newString, added: true }]);
+        }
+
+        newString = this.tokenize(newString);
+        oldString = this.tokenize(oldString);
+
+        var newLen = newString.length, oldLen = oldString.length;
+        var maxEditLength = newLen + oldLen;
+        var bestPath = [{ newPos: -1, components: [] }];
+
+        // Seed editLength = 0, i.e. the content starts with the same values
+        var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
+        if (bestPath[0].newPos+1 >= newLen && oldPos+1 >= oldLen) {
+          // Identity per the equality and tokenizer
+          return done([{value: newString.join('')}]);
+        }
+
+        // Main worker method. checks all permutations of a given edit length for acceptance.
+        function execEditLength() {
+          for (var diagonalPath = -1*editLength; diagonalPath <= editLength; diagonalPath+=2) {
+            var basePath;
+            var addPath = bestPath[diagonalPath-1],
+              removePath = bestPath[diagonalPath+1];
+            oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
+            if (addPath) {
+              // No one else is going to attempt to use this value, clear it
+              bestPath[diagonalPath-1] = undefined;
+            }
+
+            var canAdd = addPath && addPath.newPos+1 < newLen;
+            var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
+            if (!canAdd && !canRemove) {
+              // If this path is a terminal then prune
+              bestPath[diagonalPath] = undefined;
+              continue;
+            }
+
+            // Select the diagonal that we want to branch from. We select the prior
+            // path whose position in the new string is the farthest from the origin
+            // and does not pass the bounds of the diff graph
+            if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
+              basePath = clonePath(removePath);
+              self.pushComponent(basePath.components, undefined, true);
+            } else {
+              basePath = addPath;   // No need to clone, we've pulled it from the list
+              basePath.newPos++;
+              self.pushComponent(basePath.components, true, undefined);
+            }
+
+            var oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);
+
+            // If we have hit the end of both strings, then we are done
+            if (basePath.newPos+1 >= newLen && oldPos+1 >= oldLen) {
+              return done(buildValues(basePath.components, newString, oldString, self.useLongestToken));
+            } else {
+              // Otherwise track this path as a potential candidate and continue.
+              bestPath[diagonalPath] = basePath;
+            }
+          }
+
+          editLength++;
+        }
+
+        // Performs the length of edit iteration. Is a bit fugly as this has to support the
+        // sync and async mode which is never fun. Loops over execEditLength until a value
+        // is produced.
+        var editLength = 1;
+        if (callback) {
+          (function exec() {
+            setTimeout(function() {
+              // This should not happen, but we want to be safe.
+              /*istanbul ignore next */
+              if (editLength > maxEditLength) {
+                return callback();
+              }
+
+              if (!execEditLength()) {
+                exec();
+              }
+            }, 0);
+          })();
+        } else {
+          while(editLength <= maxEditLength) {
+            var ret = execEditLength();
+            if (ret) {
+              return ret;
+            }
+          }
+        }
+      },
+
+      pushComponent: function(components, added, removed) {
+        var last = components[components.length-1];
+        if (last && last.added === added && last.removed === removed) {
+          // We need to clone here as the component clone operation is just
+          // as shallow array clone
+          components[components.length-1] = {count: last.count + 1, added: added, removed: removed };
+        } else {
+          components.push({count: 1, added: added, removed: removed });
+        }
+      },
+      extractCommon: function(basePath, newString, oldString, diagonalPath) {
+        var newLen = newString.length,
+          oldLen = oldString.length,
+          newPos = basePath.newPos,
+          oldPos = newPos - diagonalPath,
+
+          commonCount = 0;
+        while (newPos+1 < newLen && oldPos+1 < oldLen && this.equals(newString[newPos+1], oldString[oldPos+1])) {
+          newPos++;
+          oldPos++;
+          commonCount++;
+        }
+
+        if (commonCount) {
+          basePath.components.push({count: commonCount});
+        }
+
+        basePath.newPos = newPos;
+        return oldPos;
+      },
+
+      equals: function(left, right) {
+        var reWhitespace = /\S/;
+        return left === right || (this.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right));
+      },
+      tokenize: function(value) {
+        return value.split('');
+      }
+    };
+
+    var CharDiff = new Diff();
+
+    var WordDiff = new Diff(true);
+    var WordWithSpaceDiff = new Diff();
+    WordDiff.tokenize = WordWithSpaceDiff.tokenize = function(value) {
+      return removeEmpty(value.split(/(\s+|\b)/));
+    };
+
+    var CssDiff = new Diff(true);
+    CssDiff.tokenize = function(value) {
+      return removeEmpty(value.split(/([{}:;,]|\s+)/));
+    };
+
+    var LineDiff = new Diff();
+
+    var TrimmedLineDiff = new Diff();
+    TrimmedLineDiff.ignoreTrim = true;
+
+    LineDiff.tokenize = TrimmedLineDiff.tokenize = function(value) {
+      var retLines = [],
+        lines = value.split(/^/m);
+      for(var i = 0; i < lines.length; i++) {
+        var line = lines[i],
+          lastLine = lines[i - 1],
+          lastLineLastChar = lastLine ? lastLine[lastLine.length - 1] : '';
+
+        // Merge lines that may contain windows new lines
+        if (line === '\n' && lastLineLastChar === '\r') {
+          retLines[retLines.length - 1] = retLines[retLines.length - 1].slice(0,-1) + '\r\n';
+        } else if (line) {
+          if (this.ignoreTrim) {
+            line = line.trim();
+            //add a newline unless this is the last line.
+            if (i < lines.length - 1) {
+              line += '\n';
+            }
+          }
+          retLines.push(line);
+        }
+      }
+
+      return retLines;
+    };
+
+
+    var SentenceDiff = new Diff();
+    SentenceDiff.tokenize = function (value) {
+      return removeEmpty(value.split(/(\S.+?[.!?])(?=\s+|$)/));
+    };
+
+    var JsonDiff = new Diff();
+    // Discriminate between two lines of pretty-printed, serialized JSON where one of them has a
+    // dangling comma and the other doesn't. Turns out including the dangling comma yields the nicest output:
+    JsonDiff.useLongestToken = true;
+    JsonDiff.tokenize = LineDiff.tokenize;
+    JsonDiff.equals = function(left, right) {
+      return LineDiff.equals(left.replace(/,([\r\n])/g, '$1'), right.replace(/,([\r\n])/g, '$1'));
+    };
+
+    var objectPrototypeToString = Object.prototype.toString;
+
+    // This function handles the presence of circular references by bailing out when encountering an
+    // object that is already on the "stack" of items being processed.
+    function canonicalize(obj, stack, replacementStack) {
+      stack = stack || [];
+      replacementStack = replacementStack || [];
+
+      var i;
+
+      for (var i = 0 ; i < stack.length ; i += 1) {
+        if (stack[i] === obj) {
+          return replacementStack[i];
+        }
+      }
+
+      var canonicalizedObj;
+
+      if ('[object Array]' === objectPrototypeToString.call(obj)) {
+        stack.push(obj);
+        canonicalizedObj = new Array(obj.length);
+        replacementStack.push(canonicalizedObj);
+        for (i = 0 ; i < obj.length ; i += 1) {
+          canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack);
+        }
+        stack.pop();
+        replacementStack.pop();
+      } else if (typeof obj === 'object' && obj !== null) {
+        stack.push(obj);
+        canonicalizedObj = {};
+        replacementStack.push(canonicalizedObj);
+        var sortedKeys = [];
+        for (var key in obj) {
+          sortedKeys.push(key);
+        }
+        sortedKeys.sort();
+        for (i = 0 ; i < sortedKeys.length ; i += 1) {
+          var key = sortedKeys[i];
+          canonicalizedObj[key] = canonicalize(obj[key], stack, replacementStack);
+        }
+        stack.pop();
+        replacementStack.pop();
+      } else {
+        canonicalizedObj = obj;
+      }
+      return canonicalizedObj;
+    }
+
+    return {
+      Diff: Diff,
+
+      diffChars: function(oldStr, newStr, callback) { return CharDiff.diff(oldStr, newStr, callback); },
+      diffWords: function(oldStr, newStr, callback) { return WordDiff.diff(oldStr, newStr, callback); },
+      diffWordsWithSpace: function(oldStr, newStr, callback) { return WordWithSpaceDiff.diff(oldStr, newStr, callback); },
+      diffLines: function(oldStr, newStr, callback) { return LineDiff.diff(oldStr, newStr, callback); },
+      diffTrimmedLines: function(oldStr, newStr, callback) { return TrimmedLineDiff.diff(oldStr, newStr, callback); },
+
+      diffSentences: function(oldStr, newStr, callback) { return SentenceDiff.diff(oldStr, newStr, callback); },
+
+      diffCss: function(oldStr, newStr, callback) { return CssDiff.diff(oldStr, newStr, callback); },
+      diffJson: function(oldObj, newObj, callback) {
+        return JsonDiff.diff(
+          typeof oldObj === 'string' ? oldObj : JSON.stringify(canonicalize(oldObj), undefined, '  '),
+          typeof newObj === 'string' ? newObj : JSON.stringify(canonicalize(newObj), undefined, '  '),
+          callback
+        );
+      },
+
+      createPatch: function(fileName, oldStr, newStr, oldHeader, newHeader) {
+        var ret = [];
+
+        ret.push('Index: ' + fileName);
+        ret.push('===================================================================');
+        ret.push('--- ' + fileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
+        ret.push('+++ ' + fileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
+
+        var diff = LineDiff.diff(oldStr, newStr);
+        if (!diff[diff.length-1].value) {
+          diff.pop();   // Remove trailing newline add
+        }
+        diff.push({value: '', lines: []});   // Append an empty value to make cleanup easier
+
+        function contextLines(lines) {
+          return map(lines, function(entry) { return ' ' + entry; });
+        }
+        function eofNL(curRange, i, current) {
+          var last = diff[diff.length-2],
+            isLast = i === diff.length-2,
+            isLastOfType = i === diff.length-3 && (current.added !== last.added || current.removed !== last.removed);
+
+          // Figure out if this is the last line for the given file and missing NL
+          if (!/\n$/.test(current.value) && (isLast || isLastOfType)) {
+            curRange.push('\\ No newline at end of file');
+          }
+        }
+
+        var oldRangeStart = 0, newRangeStart = 0, curRange = [],
+          oldLine = 1, newLine = 1;
+        for (var i = 0; i < diff.length; i++) {
+          var current = diff[i],
+            lines = current.lines || current.value.replace(/\n$/, '').split('\n');
+          current.lines = lines;
+
+          if (current.added || current.removed) {
+            if (!oldRangeStart) {
+              var prev = diff[i-1];
+              oldRangeStart = oldLine;
+              newRangeStart = newLine;
+
+              if (prev) {
+                curRange = contextLines(prev.lines.slice(-4));
+                oldRangeStart -= curRange.length;
+                newRangeStart -= curRange.length;
+              }
+            }
+            curRange.push.apply(curRange, map(lines, function(entry) { return (current.added?'+':'-') + entry; }));
+            eofNL(curRange, i, current);
+
+            if (current.added) {
+              newLine += lines.length;
+            } else {
+              oldLine += lines.length;
+            }
+          } else {
+            if (oldRangeStart) {
+              // Close out any changes that have been output (or join overlapping)
+              if (lines.length <= 8 && i < diff.length-2) {
+                // Overlapping
+                curRange.push.apply(curRange, contextLines(lines));
+              } else {
+                // end the range and output
+                var contextSize = Math.min(lines.length, 4);
+                ret.push(
+                  '@@ -' + oldRangeStart + ',' + (oldLine-oldRangeStart+contextSize)
+                  + ' +' + newRangeStart + ',' + (newLine-newRangeStart+contextSize)
+                  + ' @@');
+                ret.push.apply(ret, curRange);
+                ret.push.apply(ret, contextLines(lines.slice(0, contextSize)));
+                if (lines.length <= 4) {
+                  eofNL(ret, i, current);
+                }
+
+                oldRangeStart = 0;  newRangeStart = 0; curRange = [];
+              }
+            }
+            oldLine += lines.length;
+            newLine += lines.length;
+          }
+        }
+
+        return ret.join('\n') + '\n';
+      },
+
+      applyPatch: function(oldStr, uniDiff) {
+        var diffstr = uniDiff.split('\n');
+        var diff = [];
+        var i = 0,
+          remEOFNL = false,
+          addEOFNL = false;
+
+        // Skip to the first change chunk
+        while (i < diffstr.length && !/^@@/.test(diffstr[i])) {
+          i++;
+        }
+
+        for (; i < diffstr.length; i++) {
+          if (diffstr[i][0] === '@') {
+            var meh = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+            diff.unshift({
+              start:meh[3],
+              oldlength:meh[2],
+              oldlines:[],
+              newlength:meh[4],
+              newlines:[]
+            });
+          } else if (diffstr[i][0] === '+') {
+            diff[0].newlines.push(diffstr[i].substr(1));
+          } else if (diffstr[i][0] === '-') {
+            diff[0].oldlines.push(diffstr[i].substr(1));
+          } else if (diffstr[i][0] === ' ') {
+            diff[0].newlines.push(diffstr[i].substr(1));
+            diff[0].oldlines.push(diffstr[i].substr(1));
+          } else if (diffstr[i][0] === '\\') {
+            if (diffstr[i-1][0] === '+') {
+              remEOFNL = true;
+            } else if (diffstr[i-1][0] === '-') {
+              addEOFNL = true;
+            }
+          }
+        }
+
+        var str = oldStr.split('\n');
+        for (var i = diff.length - 1; i >= 0; i--) {
+          var d = diff[i];
+          for (var j = 0; j < d.oldlength; j++) {
+            if (str[d.start-1+j] !== d.oldlines[j]) {
+              return false;
+            }
+          }
+          Array.prototype.splice.apply(str,[d.start-1,+d.oldlength].concat(d.newlines));
+        }
+
+        if (remEOFNL) {
+          while (!str[str.length-1]) {
+            str.pop();
+          }
+        } else if (addEOFNL) {
+          str.push('');
+        }
+        return str.join('\n');
+      },
+
+      convertChangesToXML: function(changes){
+        var ret = [];
+        for ( var i = 0; i < changes.length; i++) {
+          var change = changes[i];
+          if (change.added) {
+            ret.push('<ins>');
+          } else if (change.removed) {
+            ret.push('<del>');
+          }
+
+          ret.push(escapeHTML(change.value));
+
+          if (change.added) {
+            ret.push('</ins>');
+          } else if (change.removed) {
+            ret.push('</del>');
+          }
+        }
+        return ret.join('');
+      },
+
+      // See: http://code.google.com/p/google-diff-match-patch/wiki/API
+      convertChangesToDMP: function(changes){
+        var ret = [], change;
+        for ( var i = 0; i < changes.length; i++) {
+          change = changes[i];
+          ret.push([(change.added ? 1 : change.removed ? -1 : 0), change.value]);
+        }
+        return ret;
+      },
+
+      canonicalize: canonicalize
+    };
+  })();
+
+  /*istanbul ignore next */
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports = JsDiff;
+  }
+  else if (typeof define === 'function' && define.amd) {
+    /*global define */
+    define([], function() { return JsDiff; });
+  }
+  else if (typeof global.JsDiff === 'undefined') {
+    global.JsDiff = JsDiff;
+  }
+})(this);
\ No newline at end of file
diff --git a/lib/fakeRequire.js b/lib/fakeRequire.js
new file mode 100644
index 00000000..bb2a71fe
--- /dev/null
+++ b/lib/fakeRequire.js
@@ -0,0 +1,4 @@
+var global = this;
+function require() {
+  return global;
+}
\ No newline at end of file
diff --git a/src/diff-parser.js b/src/diff-parser.js
new file mode 100644
index 00000000..bbe3c921
--- /dev/null
+++ b/src/diff-parser.js
@@ -0,0 +1,157 @@
+/*
+ *
+ * Diff Parser (diff-parser.js)
+ * Author: rtfpessoa
+ *
+ */
+
+(function (global, undefined) {
+
+  var utils = require("./utils.js").Utils;
+
+  var LINE_TYPE = {
+    INSERTS: "d2h-ins",
+    DELETES: "d2h-del",
+    CONTEXT: "d2h-cntx",
+    INFO: "d2h-info"
+  };
+
+  function DiffParser() {
+  }
+
+  DiffParser.prototype.LINE_TYPE = LINE_TYPE;
+
+  DiffParser.prototype.generateDiffJson = function (diffInput) {
+    var files = [],
+      currentFile = null,
+      currentBlock = null,
+      oldLine = null,
+      newLine = null;
+
+    var saveBlock = function () {
+      /* add previous block(if exists) before start a new file */
+      if (currentBlock) {
+        currentFile.blocks.push(currentBlock);
+        currentBlock = null;
+      }
+    };
+
+    var saveFile = function () {
+      /*
+       * add previous file(if exists) before start a new one
+       * if it has name (to avoid binary files errors)
+       */
+      if (currentFile && currentFile.newName) {
+        files.push(currentFile);
+        currentFile = null;
+      }
+    };
+
+    var startFile = function () {
+      saveBlock();
+      saveFile();
+
+      /* create file structure */
+      currentFile = {};
+      currentFile.blocks = [];
+      currentFile.deletedLines = 0;
+      currentFile.addedLines = 0;
+    };
+
+    var startBlock = function (line) {
+      saveBlock();
+
+      var values;
+
+      if (values = /^@@ -(\d+),\d+ \+(\d+),\d+ @@.*/.exec(line)) {
+        currentFile.isTripleDiff = false;
+      } else if (values = /^@@@ -(\d+),\d+ -\d+,\d+ \+(\d+),\d+ @@@.*/.exec(line)) {
+        currentFile.isTripleDiff = true;
+      } else {
+        values = [0, 0];
+        currentFile.isTripleDiff = false;
+      }
+
+      oldLine = values[1];
+      newLine = values[2];
+
+      /* create block metadata */
+      currentBlock = {};
+      currentBlock.lines = [];
+      currentBlock.oldStartLine = oldLine;
+      currentBlock.newStartLine = newLine;
+      currentBlock.header = line;
+    };
+
+    var createLine = function (line) {
+      var currentLine = {};
+      currentLine.content = line;
+
+      /* fill the line data */
+      if (utils.startsWith(line, "+") || utils.startsWith(line, " +")) {
+        currentFile.addedLines++;
+
+        currentLine.type = LINE_TYPE.INSERTS;
+        currentLine.oldNumber = null;
+        currentLine.newNumber = newLine++;
+
+        currentBlock.lines.push(currentLine);
+
+      } else if (utils.startsWith(line, "-") || utils.startsWith(line, " -")) {
+        currentFile.deletedLines++;
+
+        currentLine.type = LINE_TYPE.DELETES;
+        currentLine.oldNumber = oldLine++;
+        currentLine.newNumber = null;
+
+        currentBlock.lines.push(currentLine);
+
+      } else {
+        currentLine.type = LINE_TYPE.CONTEXT;
+        currentLine.oldNumber = oldLine++;
+        currentLine.newNumber = newLine++;
+
+        currentBlock.lines.push(currentLine);
+      }
+    };
+
+    var diffLines = diffInput.split("\n");
+    diffLines.forEach(function (line) {
+      // Unmerged paths, and possibly other non-diffable files
+      // https://github.com/scottgonzalez/pretty-diff/issues/11
+      // Also, remove some useless lines
+      if (!line || utils.startsWith(line, "*") ||
+        utils.startsWith(line, "new") || utils.startsWith(line, "index")) {
+        return;
+      }
+
+      var values = [];
+      if (utils.startsWith(line, "diff")) {
+        startFile();
+      } else if (currentFile && !currentFile.oldName && (values = /^--- a\/(\S+).*$/.exec(line))) {
+        currentFile.oldName = values[1];
+      } else if (currentFile && !currentFile.newName && (values = /^\+\+\+ [b]?\/(\S+).*$/.exec(line))) {
+        currentFile.newName = values[1];
+
+        var fileSplit = currentFile.newName.split(".");
+        currentFile.language = fileSplit[fileSplit.length - 1];
+      } else if (currentFile && utils.startsWith(line, "@@")) {
+        startBlock(line);
+      } else if (currentBlock) {
+        createLine(line);
+      }
+    });
+
+    saveBlock();
+    saveFile();
+
+    return files;
+  };
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.DiffParser = new DiffParser();
+  } else if (typeof global.DiffParser === 'undefined') {
+    global.DiffParser = new DiffParser();
+  }
+
+})(this);
diff --git a/src/diff2html.js b/src/diff2html.js
new file mode 100644
index 00000000..ad5664fb
--- /dev/null
+++ b/src/diff2html.js
@@ -0,0 +1,77 @@
+/*
+ *
+ * Diff to HTML (diff2html.js)
+ * Author: rtfpessoa
+ *
+ * Diff commands:
+ *   git diff
+ */
+
+(function (global, undefined) {
+
+  var diffParser = require("./diff-parser.js").DiffParser;
+  var htmlPrinter = require("./html-printer.js").HtmlPrinter;
+
+  function Diff2Html() {
+  }
+
+  /*
+   * config
+   * {
+   * "wordByWord" : true (default)
+   * OR
+   * "charByChar" : true
+   * }
+   *
+   */
+
+  /*
+   * Generates pretty html from string diff input
+   */
+  Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput, config) {
+    var diffJson = diffParser.generateDiffJson(diffInput);
+
+    var configOrEmpty = config || {};
+    return htmlPrinter.generateLineByLineJsonHtml(diffJson, configOrEmpty);
+  };
+
+  /*
+   * Generates json object from string diff input
+   */
+  Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
+    return diffParser.generateDiffJson(diffInput);
+  };
+
+  /*
+   * Generates pretty html from a json object
+   */
+  Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson, config) {
+    var configOrEmpty = config || {};
+    return htmlPrinter.generateLineByLineJsonHtml(diffJson, configOrEmpty);
+  };
+
+  /*
+   * Generates pretty side by side html from string diff input
+   */
+  Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput, config) {
+    var diffJson = diffParser.generateDiffJson(diffInput);
+
+    var configOrEmpty = config || {};
+    return htmlPrinter.generateSideBySideJsonHtml(diffJson, configOrEmpty);
+  };
+
+  /*
+   * Generates pretty side by side html from a json object
+   */
+  Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson, config) {
+    var configOrEmpty = config || {};
+    return htmlPrinter.generateSideBySideJsonHtml(diffJson, configOrEmpty);
+  };
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.Diff2Html = new Diff2Html();
+  } else if (typeof global.Diff2Html === 'undefined') {
+    global.Diff2Html = new Diff2Html();
+  }
+
+})(this);
diff --git a/src/html-printer.js b/src/html-printer.js
new file mode 100644
index 00000000..8237cbfb
--- /dev/null
+++ b/src/html-printer.js
@@ -0,0 +1,26 @@
+/*
+ *
+ * HtmlPrinter (html-printer.js)
+ * Author: rtfpessoa
+ *
+ */
+
+(function (global, undefined) {
+
+  var lineByLinePrinter = require("./line-by-line-printer.js").LineByLinePrinter;
+  var sideBySidePrinter = require("./side-by-side-printer.js").SideBySidePrinter;
+
+  function HtmlPrinter() {
+  }
+
+  HtmlPrinter.prototype.generateLineByLineJsonHtml = lineByLinePrinter.generateLineByLineJsonHtml;
+
+  HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml;
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.HtmlPrinter = new HtmlPrinter();
+  } else if (typeof global.HtmlPrinter === 'undefined') {
+    global.HtmlPrinter = new HtmlPrinter();
+  }
+
+})(this);
diff --git a/src/line-by-line-printer.js b/src/line-by-line-printer.js
new file mode 100644
index 00000000..20b040d5
--- /dev/null
+++ b/src/line-by-line-printer.js
@@ -0,0 +1,131 @@
+/*
+ *
+ * LineByLinePrinter (line-by-line-printer.js)
+ * Author: rtfpessoa
+ *
+ */
+
+(function (global, undefined) {
+
+  var diffParser = require("./diff-parser.js").DiffParser;
+  var printerUtils = require("./printer-utils.js").PrinterUtils;
+  var utils = require("./utils.js").Utils;
+
+  function LineByLinePrinter() {
+  }
+
+  LineByLinePrinter.prototype.generateLineByLineJsonHtml = function (diffFiles, config) {
+    return "<div class=\"d2h-wrapper\">\n" +
+      diffFiles.map(function (file) {
+        return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
+          "     <div class=\"d2h-file-header\">\n" +
+          "       <div class=\"d2h-file-stats\">\n" +
+          "         <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
+          "         <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
+          "       </div>\n" +
+          "       <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file.oldName, file.newName) + "</div>\n" +
+          "     </div>\n" +
+          "     <div class=\"d2h-file-diff\">\n" +
+          "       <div class=\"d2h-code-wrapper\">\n" +
+          "         <table class=\"d2h-diff-table\">\n" +
+          "           <tbody class=\"d2h-diff-tbody\">\n" +
+          "         " + generateFileHtml(file, config) +
+          "           </tbody>\n" +
+          "         </table>\n" +
+          "       </div>\n" +
+          "     </div>\n" +
+          "   </div>\n";
+      }).join("\n") +
+      "</div>\n";
+  };
+
+  function generateFileHtml(file, config) {
+    return file.blocks.map(function (block) {
+
+      var lines = "<tr>\n" +
+        "  <td class=\"d2h-code-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
+        "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
+        "    <div class=\"d2h-code-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
+        "  </td>\n" +
+        "</tr>\n";
+
+      var oldLines = [], newLines = [];
+      var processedOldLines = [], processedNewLines = [];
+
+      for (var i = 0; i < block.lines.length; i++) {
+        var line = block.lines[i];
+        var escapedLine = utils.escape(line.content);
+
+        if (line.type == diffParser.LINE_TYPE.CONTEXT && !oldLines.length && !newLines.length) {
+          lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
+        } else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length && !newLines.length) {
+          lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
+        } else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
+          oldLines.push(line);
+        } else if (line.type == diffParser.LINE_TYPE.INSERTS && oldLines.length > newLines.length) {
+          newLines.push(line);
+        } else {
+          var j = 0;
+          var oldLine, newLine;
+          var oldEscapedLine, newEscapedLine;
+
+          if (oldLines.length === newLines.length) {
+            for (j = 0; j < oldLines.length; j++) {
+              oldLine = oldLines[j];
+              newLine = newLines[j];
+              oldEscapedLine = utils.escape(oldLine.content);
+              newEscapedLine = utils.escape(newLine.content);
+
+              config.isTripleDiff = file.isTripleDiff;
+              var diff = printerUtils.diffHighlight(oldEscapedLine, newEscapedLine, config);
+
+              processedOldLines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, diff.o);
+              processedNewLines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, diff.n);
+            }
+
+            lines += processedOldLines + processedNewLines;
+          } else {
+            for (j = 0; j < oldLines.length; j++) {
+              oldLine = oldLines[j];
+              oldEscapedLine = utils.escape(oldLine.content);
+              lines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, oldEscapedLine);
+            }
+
+            for (j = 0; j < newLines.length; j++) {
+              newLine = newLines[j];
+              newEscapedLine = utils.escape(newLine.content);
+              lines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, newEscapedLine);
+            }
+          }
+
+          oldLines = [];
+          newLines = [];
+          processedOldLines = [];
+          processedNewLines = [];
+          i--;
+        }
+      }
+
+      return lines;
+    }).join("\n");
+  }
+
+  function generateLineHtml(type, oldNumber, newNumber, content) {
+    return "<tr>\n" +
+      "  <td class=\"d2h-code-linenumber " + type + "\">" +
+      "    <div class=\"line-num1\">" + utils.valueOrEmpty(oldNumber) + "</div>" +
+      "    <div class=\"line-num2\">" + utils.valueOrEmpty(newNumber) + "</div>" +
+      "  </td>\n" +
+      "  <td class=\"" + type + "\">" +
+      "    <div class=\"d2h-code-line " + type + "\">" + content + "</div>" +
+      "  </td>\n" +
+      "</tr>\n";
+  }
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.LineByLinePrinter = new LineByLinePrinter();
+  } else if (typeof global.LineByLinePrinter === 'undefined') {
+    global.LineByLinePrinter = new LineByLinePrinter();
+  }
+
+})(this);
diff --git a/src/printer-utils.js b/src/printer-utils.js
new file mode 100644
index 00000000..2ea00d44
--- /dev/null
+++ b/src/printer-utils.js
@@ -0,0 +1,77 @@
+/*
+ *
+ * PrinterUtils (printer-utils.js)
+ * Author: rtfpessoa
+ *
+ */
+
+(function (global, undefined) {
+
+  // dirty hack for browser compatibility
+  var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) || require("../lib/diff.js");
+
+  function PrinterUtils() {
+  }
+
+  PrinterUtils.prototype.getDiffName = function (oldFilename, newFilename) {
+    if (oldFilename && newFilename && oldFilename !== newFilename) {
+      return oldFilename + " -> " + newFilename;
+    } else if (newFilename) {
+      return newFilename;
+    } else if (oldFilename) {
+      return oldFilename;
+    } else {
+      return "Unknown filename";
+    }
+  };
+
+  PrinterUtils.prototype.diffHighlight = function (diffLine1, diffLine2, config) {
+    var lineStart1, lineStart2;
+
+    var prefixSize = 1;
+
+    if (config.isTripleDiff) prefixSize = 2;
+
+    lineStart1 = diffLine1.substr(0, prefixSize);
+    lineStart2 = diffLine2.substr(0, prefixSize);
+
+    diffLine1 = diffLine1.substr(prefixSize);
+    diffLine2 = diffLine2.substr(prefixSize);
+
+    var diff;
+    if (config.charByChar) diff = jsDiff.diffChars(diffLine1, diffLine2);
+    else diff = jsDiff.diffWordsWithSpace(diffLine1, diffLine2);
+
+    //var diff = jsDiff.diffChars(diffLine1, diffLine2);
+    //var diff = jsDiff.diffWordsWithSpace(diffLine1, diffLine2);
+
+    var highlightedLine = "";
+
+    diff.forEach(function (part) {
+      var elemType = part.added ? 'ins' : part.removed ? 'del' : null;
+
+      if (elemType !== null) highlightedLine += "<" + elemType + ">" + part.value + "</" + elemType + ">";
+      else highlightedLine += part.value;
+    });
+
+    return {
+      o: lineStart1 + removeIns(highlightedLine),
+      n: lineStart2 + removeDel(highlightedLine)
+    }
+  };
+
+  function removeIns(line) {
+    return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
+  }
+
+  function removeDel(line) {
+    return line.replace(/(<del>((.|\n)*?)<\/del>)/g, "");
+  }
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.PrinterUtils = new PrinterUtils();
+  } else if (typeof global.PrinterUtils === 'undefined') {
+    global.PrinterUtils = new PrinterUtils();
+  }
+
+})(this);
diff --git a/src/side-by-side-printer.js b/src/side-by-side-printer.js
new file mode 100644
index 00000000..dca025f9
--- /dev/null
+++ b/src/side-by-side-printer.js
@@ -0,0 +1,157 @@
+/*
+ *
+ * HtmlPrinter (html-printer.js)
+ * Author: rtfpessoa
+ *
+ */
+
+(function (global, undefined) {
+
+  var diffParser = require("./diff-parser.js").DiffParser;
+  var printerUtils = require("./printer-utils.js").PrinterUtils;
+  var utils = require("./utils.js").Utils;
+
+  function SideBySidePrinter() {
+  }
+
+  SideBySidePrinter.prototype.generateSideBySideJsonHtml = function (diffFiles, config) {
+    return "<div class=\"d2h-wrapper\">\n" +
+      diffFiles.map(function (file) {
+        var diffs = generateSideBySideFileHtml(file, config);
+
+        return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
+          "     <div class=\"d2h-file-header\">\n" +
+          "       <div class=\"d2h-file-stats\">\n" +
+          "         <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
+          "         <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
+          "       </div>\n" +
+          "       <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file.oldName, file.newName) + "</div>\n" +
+          "     </div>\n" +
+          "     <div class=\"d2h-files-diff\">\n" +
+          "       <div class=\"d2h-file-side-diff\">\n" +
+          "         <div class=\"d2h-code-wrapper\">\n" +
+          "           <table class=\"d2h-diff-table\">\n" +
+          "             <tbody class=\"d2h-diff-tbody\">\n" +
+          "           " + diffs.left +
+          "             </tbody>\n" +
+          "           </table>\n" +
+          "         </div>\n" +
+          "       </div>\n" +
+          "       <div class=\"d2h-file-side-diff\">\n" +
+          "         <div class=\"d2h-code-wrapper\">\n" +
+          "           <table class=\"d2h-diff-table\">\n" +
+          "             <tbody class=\"d2h-diff-tbody\">\n" +
+          "           " + diffs.right +
+          "             </tbody>\n" +
+          "           </table>\n" +
+          "         </div>\n" +
+          "       </div>\n" +
+          "     </div>\n" +
+          "   </div>\n";
+      }).join("\n") +
+      "</div>\n";
+  };
+
+  function generateSideBySideFileHtml(file, config) {
+    var fileHtml = {};
+    fileHtml.left = "";
+    fileHtml.right = "";
+
+    file.blocks.forEach(function (block) {
+
+      fileHtml.left += "<tr>\n" +
+      "  <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
+      "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
+      "    <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
+      "  </td>\n" +
+      "</tr>\n";
+
+      fileHtml.right += "<tr>\n" +
+      "  <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
+      "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
+      "    <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\"></div>" +
+      "  </td>\n" +
+      "</tr>\n";
+
+      var oldLines = [], newLines = [];
+
+      for (var i = 0; i < block.lines.length; i++) {
+        var line = block.lines[i];
+        var escapedLine = utils.escape(line.content);
+
+        if (line.type == diffParser.LINE_TYPE.CONTEXT && !oldLines.length && !newLines.length) {
+          fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
+          fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
+        } else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length && !newLines.length) {
+          fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
+          fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
+        } else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
+          oldLines.push(line);
+        } else if (line.type == diffParser.LINE_TYPE.INSERTS && oldLines.length > newLines.length) {
+          newLines.push(line);
+        } else {
+          var j = 0;
+          var oldLine, newLine;
+          var oldEscapedLine, newEscapedLine;
+
+          if (oldLines.length === newLines.length) {
+            for (j = 0; j < oldLines.length; j++) {
+              oldLine = oldLines[j];
+              newLine = newLines[j];
+              oldEscapedLine = utils.escape(oldLine.content);
+              newEscapedLine = utils.escape(newLine.content);
+
+              config.isTripleDiff = file.isTripleDiff;
+
+              var diff = printerUtils.diffHighlight(oldEscapedLine, newEscapedLine, config);
+
+              fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, diff.o);
+              fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.n);
+            }
+          } else {
+            var maxLinesNumber = Math.max(oldLines.length, newLines.length);
+            for (j = 0; j < maxLinesNumber; j++) {
+              oldLine = oldLines[j];
+              newLine = newLines[j];
+
+              if (oldLine && newLine) {
+                fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
+                fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
+              } else if (oldLine) {
+                fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
+                fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
+              } else if (newLine) {
+                fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
+                fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
+              } else {
+                console.error("How did it get here?");
+              }
+            }
+          }
+
+          oldLines = [];
+          newLines = [];
+          i--;
+        }
+      }
+    });
+
+    return fileHtml;
+  }
+
+  function generateSingleLineHtml(type, number, content) {
+    return "<tr>\n" +
+      "    <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
+      "    <td class=\"" + type + "\">" +
+      "      <div class=\"d2h-code-side-line " + type + "\">" + content + "</div>" +
+      "    </td>\n" +
+      "  </tr>\n";
+  }
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.SideBySidePrinter = new SideBySidePrinter();
+  } else if (typeof global.SideBySidePrinter === 'undefined') {
+    global.SideBySidePrinter = new SideBySidePrinter();
+  }
+
+})(this);
diff --git a/src/utils.js b/src/utils.js
new file mode 100644
index 00000000..d7cdb04c
--- /dev/null
+++ b/src/utils.js
@@ -0,0 +1,35 @@
+/*
+ *
+ * Utils (utils.js)
+ * Author: rtfpessoa
+ *
+ */
+
+(function (global, undefined) {
+
+  function Utils() {
+  }
+
+  Utils.prototype.escape = function (str) {
+    return str.slice(0)
+      .replace(/&/g, "&amp;")
+      .replace(/</g, "&lt;")
+      .replace(/>/g, "&gt;")
+      .replace(/\t/g, "    ");
+  };
+
+  Utils.prototype.startsWith = function (str, start) {
+    return str.indexOf(start) === 0;
+  };
+
+  Utils.prototype.valueOrEmpty = function (value) {
+    return value ? value : "";
+  };
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.Utils = new Utils();
+  } else if (typeof global.Utils === 'undefined') {
+    global.Utils = new Utils();
+  }
+
+})(this);