*     {
  *      "class": "org.commoncrawl.stormcrawler.news.bootstrap.FeedLinkParseFilter",
@@ -41,12 +40,10 @@
  */
 public class FeedLinkParseFilter extends LinkParseFilter {
 
-    private static final org.slf4j.Logger LOG = LoggerFactory
-            .getLogger(FeedLinkParseFilter.class);
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(FeedLinkParseFilter.class);
 
     @Override
-    public void filter(String URL, byte[] content, DocumentFragment doc,
-            ParseResult parse) {
+    public void filter(String URL, byte[] content, DocumentFragment doc, ParseResult parse) {
 
         // skip existing links
         logLinks(parse, URL, "Skipped links");
@@ -60,11 +57,8 @@ public void filter(String URL, byte[] content, DocumentFragment doc,
 
     public static void logLinks(ParseResult parse, String URL, String message) {
         if (LOG.isDebugEnabled() && parse.getOutlinks().size() > 0) {
-            if (!message.isEmpty())
-                LOG.debug("{} for {}:", message, URL);
-            for (Outlink outlink : parse.getOutlinks())
-                LOG.debug(outlink.getTargetURL());
+            if (!message.isEmpty()) LOG.debug("{} for {}:", message, URL);
+            for (Outlink outlink : parse.getOutlinks()) LOG.debug(outlink.getTargetURL());
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/commoncrawl/stormcrawler/news/bootstrap/NewsSiteMapDetectorBolt.java b/src/main/java/org/commoncrawl/stormcrawler/news/bootstrap/NewsSiteMapDetectorBolt.java
index 2b773be..f0af134 100644
--- a/src/main/java/org/commoncrawl/stormcrawler/news/bootstrap/NewsSiteMapDetectorBolt.java
+++ b/src/main/java/org/commoncrawl/stormcrawler/news/bootstrap/NewsSiteMapDetectorBolt.java
@@ -14,42 +14,38 @@
 package org.commoncrawl.stormcrawler.news.bootstrap;
 
 import java.util.Map;
-
 import org.apache.storm.task.OutputCollector;
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.tuple.Tuple;
 import org.apache.storm.tuple.Values;
+import org.apache.stormcrawler.Constants;
+import org.apache.stormcrawler.Metadata;
+import org.apache.stormcrawler.bolt.SiteMapParserBolt;
+import org.apache.stormcrawler.parse.ParseData;
+import org.apache.stormcrawler.parse.ParseFilter;
+import org.apache.stormcrawler.parse.ParseFilters;
+import org.apache.stormcrawler.parse.ParseResult;
+import org.apache.stormcrawler.persistence.Status;
 import org.commoncrawl.stormcrawler.news.ContentDetector;
 import org.commoncrawl.stormcrawler.news.NewsSiteMapParserBolt;
 import org.slf4j.LoggerFactory;
 
-import com.digitalpebble.stormcrawler.Constants;
-import com.digitalpebble.stormcrawler.Metadata;
-import com.digitalpebble.stormcrawler.bolt.SiteMapParserBolt;
-import com.digitalpebble.stormcrawler.parse.ParseData;
-import com.digitalpebble.stormcrawler.parse.ParseFilter;
-import com.digitalpebble.stormcrawler.parse.ParseFilters;
-import com.digitalpebble.stormcrawler.parse.ParseResult;
-import com.digitalpebble.stormcrawler.persistence.Status;
-
 /**
- * Detector for news
+ * Detector for news
  * sitemaps and also sitemaps.
  */
 @SuppressWarnings("serial")
 public class NewsSiteMapDetectorBolt extends SiteMapParserBolt {
 
-    private static final org.slf4j.Logger LOG = LoggerFactory
-            .getLogger(NewsSiteMapDetectorBolt.class);
+    private static final org.slf4j.Logger LOG =
+            LoggerFactory.getLogger(NewsSiteMapDetectorBolt.class);
 
     protected static final int maxOffsetContentGuess = 1024;
-    private static ContentDetector contentDetector = new ContentDetector(
-            NewsSiteMapParserBolt.contentClues, maxOffsetContentGuess);
+    private static ContentDetector contentDetector =
+            new ContentDetector(NewsSiteMapParserBolt.contentClues, maxOffsetContentGuess);
 
     private ParseFilter parseFilters;
 
-
     @Override
     public void execute(Tuple tuple) {
         Metadata metadata = (Metadata) tuple.getValueByField("metadata");
@@ -57,10 +53,9 @@ public void execute(Tuple tuple) {
         byte[] content = tuple.getBinaryByField("content");
         String url = tuple.getStringByField("url");
 
-        boolean isSitemap = Boolean.valueOf(
-                metadata.getFirstValue(SiteMapParserBolt.isSitemapKey));
-        boolean isNewsSitemap = Boolean.valueOf(
-                metadata.getFirstValue(NewsSiteMapParserBolt.isSitemapNewsKey));
+        boolean isSitemap = Boolean.valueOf(metadata.getFirstValue(SiteMapParserBolt.isSitemapKey));
+        boolean isNewsSitemap =
+                Boolean.valueOf(metadata.getFirstValue(NewsSiteMapParserBolt.isSitemapNewsKey));
 
         if (!isNewsSitemap || !isSitemap) {
             int match = contentDetector.getFirstMatch(content);
@@ -70,10 +65,8 @@ public void execute(Tuple tuple) {
                 metadata.setValue(SiteMapParserBolt.isSitemapKey, "true");
                 if (match <= NewsSiteMapParserBolt.contentCluesSitemapNewsMatchUpTo) {
                     isNewsSitemap = true;
-                    LOG.info("{} detected as news sitemap based on content",
-                            url);
-                    metadata.setValue(NewsSiteMapParserBolt.isSitemapNewsKey,
-                            "true");
+                    LOG.info("{} detected as news sitemap based on content", url);
+                    metadata.setValue(NewsSiteMapParserBolt.isSitemapNewsKey, "true");
                 }
             }
         }
@@ -85,8 +78,8 @@ public void execute(Tuple tuple) {
             parseData.setMetadata(metadata);
             parseFilters.filter(url, content, null, parse);
             // emit status
-            collector.emit(Constants.StatusStreamName, tuple,
-                    new Values(url, metadata, Status.FETCHED));
+            collector.emit(
+                    Constants.StatusStreamName, tuple, new Values(url, metadata, Status.FETCHED));
         } else {
             // pass on
             collector.emit(tuple, tuple.getValues());
@@ -95,11 +88,9 @@ public void execute(Tuple tuple) {
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public void prepare(Map stormConf, TopologyContext context,
-            OutputCollector collect) {
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public void prepare(Map stormConf, TopologyContext context, OutputCollector collect) {
         super.prepare(stormConf, context, collect);
         parseFilters = ParseFilters.fromConf(stormConf);
     }
-
 }
diff --git a/src/main/resources/bootstrap-parsefilters.json b/src/main/resources/bootstrap-parsefilters.json
index dd14cb6..cd8f425 100644
--- a/src/main/resources/bootstrap-parsefilters.json
+++ b/src/main/resources/bootstrap-parsefilters.json
@@ -1,7 +1,7 @@
 {
-  "com.digitalpebble.stormcrawler.parse.ParseFilters": [
+  "org.apache.stormcrawler.parse.ParseFilters": [
     {
-      "class": "com.digitalpebble.stormcrawler.parse.filter.MD5SignatureParseFilter",
+      "class": "org.apache.stormcrawler.parse.filter.MD5SignatureParseFilter",
       "name": "MD5Digest",
       "params": {
         "useText": "false",
@@ -10,7 +10,7 @@
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.parse.filter.XPathFilter",
+      "class": "org.apache.stormcrawler.parse.filter.XPathFilter",
       "name": "CanonicalLink",
       "params": {
         "canonical": "//*[@rel=\"canonical\"]/@href"
diff --git a/src/main/resources/bootstrap-urlfilters.json b/src/main/resources/bootstrap-urlfilters.json
index 9803190..c539445 100644
--- a/src/main/resources/bootstrap-urlfilters.json
+++ b/src/main/resources/bootstrap-urlfilters.json
@@ -1,7 +1,7 @@
 {
-  "com.digitalpebble.stormcrawler.filtering.URLFilters": [
+  "org.apache.stormcrawler.filtering.URLFilters": [
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.basic.BasicURLNormalizer",
+      "class": "org.apache.stormcrawler.filtering.basic.BasicURLNormalizer",
       "name": "BasicURLNormalizer",
       "params": {
         "removeAnchorPart": true,
@@ -11,7 +11,7 @@
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.host.HostURLFilter",
+      "class": "org.apache.stormcrawler.filtering.host.HostURLFilter",
       "name": "HostURLFilter",
       "params": {
         "ignoreOutsideHost": false,
@@ -19,21 +19,21 @@
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.regex.RegexURLNormalizer",
+      "class": "org.apache.stormcrawler.filtering.regex.RegexURLNormalizer",
       "name": "RegexURLNormalizer",
       "params": {
         "regexNormalizerFile": "default-regex-normalizers.xml"
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.regex.RegexURLFilter",
+      "class": "org.apache.stormcrawler.filtering.regex.RegexURLFilter",
       "name": "RegexURLFilter",
       "params": {
         "regexFilterFile": "default-regex-filters.txt"
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.basic.SelfURLFilter",
+      "class": "org.apache.stormcrawler.filtering.basic.SelfURLFilter",
       "name": "SelfURLFilter"
     }
   ]
diff --git a/src/main/resources/indexer.mapping b/src/main/resources/indexer.mapping
new file mode 100644
index 0000000..b788e6b
--- /dev/null
+++ b/src/main/resources/indexer.mapping
@@ -0,0 +1,40 @@
+{
+	"settings": {
+		"index": {
+			"number_of_shards": 5,
+			"number_of_replicas": 1,
+			"refresh_interval": "60s"
+		}
+	},
+	"mappings": {
+			"_source": {
+				"enabled": true
+			},
+			"properties": {
+				"content": {
+					"type": "text"
+				},
+				"description": {
+					"type": "text"
+				},
+				"domain": {
+					"type": "keyword"
+				},
+				"format": {
+					"type": "keyword"
+				},
+				"keywords": {
+					"type": "keyword"
+				},
+				"host": {
+					"type": "keyword"
+				},
+				"title": {
+					"type": "text"
+				},
+				"url": {
+					"type": "keyword"
+				}
+			}
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/inject-urlfilters.json b/src/main/resources/inject-urlfilters.json
index a6e4865..43c1448 100644
--- a/src/main/resources/inject-urlfilters.json
+++ b/src/main/resources/inject-urlfilters.json
@@ -1,14 +1,14 @@
 {
-  "com.digitalpebble.stormcrawler.filtering.URLFilters": [
+  "org.apache.stormcrawler.filtering.URLFilters": [
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.depth.MaxDepthFilter",
+      "class": "org.apache.stormcrawler.filtering.depth.MaxDepthFilter",
       "name": "MaxDepthFilter",
       "params": {
         "maxDepth": -1
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.basic.BasicURLFilter",
+      "class": "org.apache.stormcrawler.filtering.basic.BasicURLFilter",
       "name": "BasicURLFilter",
       "params": {
         "maxPathRepetition": 4,
@@ -16,7 +16,7 @@
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.basic.BasicURLNormalizer",
+      "class": "org.apache.stormcrawler.filtering.basic.BasicURLNormalizer",
       "name": "BasicURLNormalizer",
       "params": {
         "removeAnchorPart": true,
@@ -26,21 +26,21 @@
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.regex.RegexURLNormalizer",
+      "class": "org.apache.stormcrawler.filtering.regex.RegexURLNormalizer",
       "name": "RegexURLNormalizer",
       "params": {
         "regexNormalizerFile": "default-regex-normalizers.xml"
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.regex.RegexURLFilter",
+      "class": "org.apache.stormcrawler.filtering.regex.RegexURLFilter",
       "name": "RegexURLFilter",
       "params": {
         "regexFilterFile": "default-regex-filters.txt"
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.basic.SelfURLFilter",
+      "class": "org.apache.stormcrawler.filtering.basic.SelfURLFilter",
       "name": "SelfURLFilter"
     }
   ]
diff --git a/src/main/resources/metrics.mapping b/src/main/resources/metrics.mapping
new file mode 100644
index 0000000..5b2ac15
--- /dev/null
+++ b/src/main/resources/metrics.mapping
@@ -0,0 +1,40 @@
+{
+	  "index_patterns": "metrics*",
+	  "settings": {
+	    "index": {
+	      "number_of_shards": 1,
+	      "refresh_interval": "30s"
+	    },
+	    "number_of_replicas": 0
+	  },
+	  "mappings": {
+	      "_source":         { "enabled": true },
+	      "properties": {
+	          "name": {
+	            "type": "keyword"
+	          },
+	          "stormId": {
+	            "type": "keyword"
+	          },
+	          "srcComponentId": {
+	            "type": "keyword"
+	          },
+	          "srcTaskId": {
+	            "type": "short"
+	          },
+	          "srcWorkerHost": {
+	            "type": "keyword"
+	          },
+	          "srcWorkerPort": {
+	            "type": "integer"
+	          },
+	          "timestamp": {
+	            "type": "date",
+	            "format": "date_optional_time"
+	          },
+	          "value": {
+	            "type": "double"
+	          }
+	      }
+	  }
+}
\ No newline at end of file
diff --git a/src/main/resources/parsefilters.json b/src/main/resources/parsefilters.json
index 3dbf31f..56bb86b 100644
--- a/src/main/resources/parsefilters.json
+++ b/src/main/resources/parsefilters.json
@@ -1,7 +1,7 @@
 {
-  "com.digitalpebble.stormcrawler.parse.ParseFilters": [
+  "org.apache.stormcrawler.parse.ParseFilters": [
     {
-      "class": "com.digitalpebble.stormcrawler.parse.filter.MD5SignatureParseFilter",
+      "class": "org.apache.stormcrawler.parse.filter.MD5SignatureParseFilter",
       "name": "MD5Digest",
       "params": {
         "useText": "false",
diff --git a/src/main/resources/pre-urlfilters.json b/src/main/resources/pre-urlfilters.json
index 7b17a85..eaa82a4 100644
--- a/src/main/resources/pre-urlfilters.json
+++ b/src/main/resources/pre-urlfilters.json
@@ -1,5 +1,5 @@
 {
-  "com.digitalpebble.stormcrawler.filtering.URLFilters": [
+  "org.apache.stormcrawler.filtering.URLFilters": [
     {
       "class": "org.commoncrawl.stormcrawler.filter.FastURLFilter",
       "params": {
diff --git a/src/main/resources/status.mapping b/src/main/resources/status.mapping
new file mode 100644
index 0000000..e5b14fe
--- /dev/null
+++ b/src/main/resources/status.mapping
@@ -0,0 +1,39 @@
+{
+	"settings": {
+		"index": {
+			"number_of_shards": 10,
+			"number_of_replicas": 1,
+			"refresh_interval": "5s"
+		}
+	},
+	"mappings": {
+			"dynamic_templates": [{
+				"metadata": {
+					"path_match": "metadata.*",
+					"match_mapping_type": "string",
+					"mapping": {
+						"type": "keyword"
+					}
+				}
+			}],
+			"_source": {
+				"enabled": true
+			},
+			"properties": {
+				"key": {
+					"type": "keyword",
+					"index": true
+				},
+				"nextFetchDate": {
+					"type": "date",
+					"format": "date_optional_time"
+				},
+				"status": {
+					"type": "keyword"
+				},
+				"url": {
+					"type": "keyword"
+				}
+			}
+	}
+}
diff --git a/src/main/resources/urlfilters.json b/src/main/resources/urlfilters.json
index 6272569..98f7892 100644
--- a/src/main/resources/urlfilters.json
+++ b/src/main/resources/urlfilters.json
@@ -1,14 +1,14 @@
 {
-  "com.digitalpebble.stormcrawler.filtering.URLFilters": [
+  "org.apache.stormcrawler.filtering.URLFilters": [
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.depth.MaxDepthFilter",
+      "class": "org.apache.stormcrawler.filtering.depth.MaxDepthFilter",
       "name": "MaxDepthFilter",
       "params": {
         "maxDepth": -1
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.basic.BasicURLFilter",
+      "class": "org.apache.stormcrawler.filtering.basic.BasicURLFilter",
       "name": "BasicURLFilter",
       "params": {
         "maxPathRepetition": 4,
@@ -16,7 +16,7 @@
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.basic.BasicURLNormalizer",
+      "class": "org.apache.stormcrawler.filtering.basic.BasicURLNormalizer",
       "name": "BasicURLNormalizer",
       "params": {
         "removeAnchorPart": true,
@@ -26,18 +26,18 @@
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.regex.RegexURLFilter",
+      "class": "org.apache.stormcrawler.filtering.regex.RegexURLFilter",
       "name": "RegexURLFilter",
       "params": {
         "regexFilterFile": "default-regex-filters.txt"
       }
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.basic.SelfURLFilter",
+      "class": "org.apache.stormcrawler.filtering.basic.SelfURLFilter",
       "name": "SelfURLFilter"
     },
     {
-      "class": "com.digitalpebble.stormcrawler.filtering.robots.RobotsFilter",
+      "class": "org.apache.stormcrawler.filtering.robots.RobotsFilter",
       "name": "RobotsFilter",
       "params": {
         "fromCacheOnly": true
diff --git a/src/test/java/org/commoncrawl/stormcrawler/FastURLFilterTest.java b/src/test/java/org/commoncrawl/stormcrawler/FastURLFilterTest.java
index 9914d9e..58aaa04 100644
--- a/src/test/java/org/commoncrawl/stormcrawler/FastURLFilterTest.java
+++ b/src/test/java/org/commoncrawl/stormcrawler/FastURLFilterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to DigitalPebble Ltd under one or more contributor license agreements. See the NOTICE
  * file distributed with this work for additional information regarding copyright ownership.
  * DigitalPebble licenses this file to You under the Apache License, Version 2.0 (the "License");
@@ -14,74 +14,72 @@
  */
 package org.commoncrawl.stormcrawler;
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
-
+import org.apache.stormcrawler.Metadata;
+import org.apache.stormcrawler.filtering.URLFilter;
 import org.commoncrawl.stormcrawler.filter.FastURLFilter;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.digitalpebble.stormcrawler.Metadata;
-import com.digitalpebble.stormcrawler.filtering.URLFilter;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
 public class FastURLFilterTest {
 
     protected static URLFilter filter;
 
     @BeforeClass
     public static void init() {
-	filter = createFilter("fast-urlfilter.txt");
+        filter = createFilter("fast-urlfilter.txt");
     }
 
     public static FastURLFilter createFilter(String fileName) {
-	ObjectNode filterParams = new ObjectNode(JsonNodeFactory.instance);
-	filterParams.put("file", fileName);
-	FastURLFilter filter = new FastURLFilter();
-	Map conf = new HashMap<>();
-	conf.put("fast.urlfilter.refresh", 10);
-	filter.configure(conf, filterParams);
-	return filter;
+        ObjectNode filterParams = new ObjectNode(JsonNodeFactory.instance);
+        filterParams.put("file", fileName);
+        FastURLFilter filter = new FastURLFilter();
+        Map conf = new HashMap<>();
+        conf.put("fast.urlfilter.refresh", 10);
+        filter.configure(conf, filterParams);
+        return filter;
     }
 
     @Test
     public void testHostFilter() throws MalformedURLException {
-	URL url = new URL("http://may.go.com/image.jpg");
-	Metadata metadata = new Metadata();
-	String filterResult = filter.filter(url, metadata, url.toExternalForm());
-	Assert.assertEquals(url.toString(), filterResult);
-	
-	url = new URL("http://no.go.com/");
-	filterResult = filter.filter(url, metadata, url.toExternalForm());
-	Assert.assertEquals(null, filterResult);
+        URL url = new URL("http://may.go.com/image.jpg");
+        Metadata metadata = new Metadata();
+        String filterResult = filter.filter(url, metadata, url.toExternalForm());
+        Assert.assertEquals(url.toString(), filterResult);
+
+        url = new URL("http://no.go.com/");
+        filterResult = filter.filter(url, metadata, url.toExternalForm());
+        Assert.assertEquals(null, filterResult);
     }
 
     @Test
     public void testDomainNotAllowed() throws MalformedURLException {
-	URL url = new URL("http://domainnotallowed.com/forum/search.php");
-	Metadata metadata = new Metadata();
-	String filterResult = filter.filter(url, metadata, url.toExternalForm());
-	Assert.assertEquals(null, filterResult);
-	
-	url = new URL("http://domainnotallowed.com/");
-	filterResult = filter.filter(url, metadata, url.toExternalForm());
-	Assert.assertEquals(null, filterResult);
-	
-	url = new URL("http://partiallyallowed.com/");
-	filterResult = filter.filter(url, metadata, url.toExternalForm());
-	Assert.assertEquals(url.toString(), filterResult);
-	
-	url = new URL("http://partiallyallowed.com/verbotten");
-	filterResult = filter.filter(url, metadata, url.toExternalForm());
-	Assert.assertEquals(null, filterResult);
+        URL url = new URL("http://domainnotallowed.com/forum/search.php");
+        Metadata metadata = new Metadata();
+        String filterResult = filter.filter(url, metadata, url.toExternalForm());
+        Assert.assertEquals(null, filterResult);
+
+        url = new URL("http://domainnotallowed.com/");
+        filterResult = filter.filter(url, metadata, url.toExternalForm());
+        Assert.assertEquals(null, filterResult);
+
+        url = new URL("http://partiallyallowed.com/");
+        filterResult = filter.filter(url, metadata, url.toExternalForm());
+        Assert.assertEquals(url.toString(), filterResult);
+
+        url = new URL("http://partiallyallowed.com/verbotten");
+        filterResult = filter.filter(url, metadata, url.toExternalForm());
+        Assert.assertEquals(null, filterResult);
 
-	// allowed
-	url = new URL("http://digitalpebble.com/");
-	filterResult = filter.filter(url, metadata, url.toExternalForm());
-	Assert.assertEquals(url.toString(), filterResult);
+        // allowed
+        url = new URL("http://digitalpebble.com/");
+        filterResult = filter.filter(url, metadata, url.toExternalForm());
+        Assert.assertEquals(url.toString(), filterResult);
     }
 }
diff --git a/src/test/java/org/commoncrawl/stormcrawler/news/NewsSiteMapParserTest.java b/src/test/java/org/commoncrawl/stormcrawler/news/NewsSiteMapParserTest.java
index 7d64720..b0a0d5a 100644
--- a/src/test/java/org/commoncrawl/stormcrawler/news/NewsSiteMapParserTest.java
+++ b/src/test/java/org/commoncrawl/stormcrawler/news/NewsSiteMapParserTest.java
@@ -16,6 +16,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import crawlercommons.sitemaps.UnknownFormatException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -25,75 +26,83 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.io.IOUtils;
+import org.apache.stormcrawler.Metadata;
+import org.apache.stormcrawler.parse.Outlink;
+import org.apache.stormcrawler.parse.ParsingTester;
 import org.commoncrawl.stormcrawler.news.NewsSiteMapParserBolt.SitemapType;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.digitalpebble.stormcrawler.Metadata;
-import com.digitalpebble.stormcrawler.parse.Outlink;
-import com.digitalpebble.stormcrawler.parse.ParsingTester;
-
-import crawlercommons.sitemaps.UnknownFormatException;
-
 public class NewsSiteMapParserTest extends ParsingTester {
 
     @Before
     public void setupParserBolt() {
-	setupParserBolt(new NewsSiteMapParserBolt());
-	Map config = new HashMap<>();
-	config.put("sitemap.sniffContent", true);
-	// allow items published during the last week
-	config.put("sitemap.filter.hours.since.modified", 168);
-	prepareParserBolt("test.parsefilters.json", config);
+        setupParserBolt(new NewsSiteMapParserBolt());
+        Map config = new HashMap<>();
+        config.put("sitemap.sniffContent", true);
+        // allow items published during the last week
+        config.put("sitemap.filter.hours.since.modified", 168);
+        prepareParserBolt("test.parsefilters.json", config);
     }
 
     @Test
     public void testSiteMapParser() throws IOException, UnknownFormatException {
-	String url = "https://example.org/sitemap-news.xml";
-	byte[] content = readContent("sitemap-news.xml");
-	String contentType = "";
-	Metadata parentMetadata = new Metadata();
-	List links = new ArrayList<>();
-
-	SitemapType type = ((NewsSiteMapParserBolt) bolt).detectContent(url, content);
-	assertEquals(SitemapType.NEWS, type);
-
-	((NewsSiteMapParserBolt) bolt).parseSiteMap(url, content, contentType, parentMetadata, links);
-
-	// unmodified sitemap:
-	// - publication date is far in the past, link should be skipped
-	// 2008-12-23
-	assertEquals("Outdated link not skipped", 0, links.size());
-
-	// now set the publication date to yesterday
-	LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
-	content = (new String(content, StandardCharsets.UTF_8))
-		.replace("2008-12-23", ""
-			+ yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "")
-		.getBytes(StandardCharsets.UTF_8);
-	((NewsSiteMapParserBolt) bolt).parseSiteMap(url, content, contentType, parentMetadata, links);
-
-	assertEquals("Expected one  and one additional  link - image links are ignored", 2,
-		links.size());
+        String url = "https://example.org/sitemap-news.xml";
+        byte[] content = readContent("sitemap-news.xml");
+        String contentType = "";
+        Metadata parentMetadata = new Metadata();
+        List links = new ArrayList<>();
+
+        SitemapType type = ((NewsSiteMapParserBolt) bolt).detectContent(url, content);
+        assertEquals(SitemapType.NEWS, type);
+
+        ((NewsSiteMapParserBolt) bolt)
+                .parseSiteMap(url, content, contentType, parentMetadata, links);
+
+        // unmodified sitemap:
+        // - publication date is far in the past, link should be skipped
+        // 2008-12-23
+        assertEquals("Outdated link not skipped", 0, links.size());
+
+        // now set the publication date to yesterday
+        LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
+        content =
+                (new String(content, StandardCharsets.UTF_8))
+                        .replace(
+                                "2008-12-23",
+                                ""
+                                        + yesterday.format(
+                                                DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+                                        + "")
+                        .getBytes(StandardCharsets.UTF_8);
+        ((NewsSiteMapParserBolt) bolt)
+                .parseSiteMap(url, content, contentType, parentMetadata, links);
+
+        assertEquals(
+                "Expected one  and one additional  link - image links are ignored",
+                2,
+                links.size());
     }
 
     protected byte[] readContent(String filename) throws IOException {
-	ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	IOUtils.copy(getClass().getClassLoader().getResourceAsStream(filename), baos);
-	return baos.toByteArray();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        IOUtils.copy(getClass().getClassLoader().getResourceAsStream(filename), baos);
+        return baos.toByteArray();
     }
 
-	@Test
-     public void testFeedWithSitemapNamespace() throws IOException, UnknownFormatException {
-         String url = "https://example.org/feed.xml";
-		byte[] content = readContent("feed-with-sitemap-namespace.xml");
-         SitemapType type = ((NewsSiteMapParserBolt) bolt).detectContent(url, content);
-         assertNotEquals("RSS feed with sitemap namespace should not be detected as sitemap",
-                 SitemapType.NEWS, type);
-         assertNotEquals("RSS feed with sitemap namespace should not be detected as sitemap",
-                 SitemapType.SITEMAP, type);
-     }
-
+    @Test
+    public void testFeedWithSitemapNamespace() throws IOException, UnknownFormatException {
+        String url = "https://example.org/feed.xml";
+        byte[] content = readContent("feed-with-sitemap-namespace.xml");
+        SitemapType type = ((NewsSiteMapParserBolt) bolt).detectContent(url, content);
+        assertNotEquals(
+                "RSS feed with sitemap namespace should not be detected as sitemap",
+                SitemapType.NEWS,
+                type);
+        assertNotEquals(
+                "RSS feed with sitemap namespace should not be detected as sitemap",
+                SitemapType.SITEMAP,
+                type);
+    }
 }