diff --git a/LegoSharp/Scraping/Facet.cs b/LegoSharp/Scraping/Facet.cs
new file mode 100644
index 0000000..e535f00
--- /dev/null
+++ b/LegoSharp/Scraping/Facet.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LegoSharp
+{
+    public class Facet
+    {
+        public string id { get; set; }
+        public string key { get; set; }
+        public IEnumerable<FacetLabel> labels { get; set; }
+    }
+
+    public struct FacetLabel
+    {
+        public string name { get; set; }
+        public string value { get; set; }
+    }
+
+    public class FacetLabelComparaer : IEqualityComparer<FacetLabel>
+    {
+        public bool Equals(FacetLabel a, FacetLabel b)
+        {
+            return a.value == b.value && a.name == b.name;
+        }
+        public int GetHashCode(FacetLabel t)
+        {
+            string code = t.value + "," + t.name;
+            return code.GetHashCode();
+        }
+    }
+}
diff --git a/LegoSharp/Scraping/FacetLabel.cs b/LegoSharp/Scraping/FacetLabel.cs
deleted file mode 100644
index 3c68ff4..0000000
--- a/LegoSharp/Scraping/FacetLabel.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace LegoSharp
-{
-    public class Facet
-    {
-        public string id { get; set; }
-        public string key { get; set; }
-        public IEnumerable<FacetLabel> labels { get; set; }
-    }
-
-    public class FacetLabel
-    {
-        public string key { get; set; }
-        public string name { get; set; }
-        public string value { get; set; }
-    }
-}
diff --git a/LegoSharp/Scraping/FacetScraper.cs b/LegoSharp/Scraping/FacetScraper.cs
index a1da957..715eac1 100644
--- a/LegoSharp/Scraping/FacetScraper.cs
+++ b/LegoSharp/Scraping/FacetScraper.cs
@@ -19,9 +19,9 @@ public FacetScraper(IEnumerable<IGraphQuery<GraphQueryResultT>> queriesToScrapeW
             }
         }
 
-        public async Task<ISet<ScrapedFacetLabel>> scrapeFacet(string facetId, string facetKey)
+        public async Task<ISet<FacetLabel>> scrapeFacet(string facetId, string facetKey)
         {
-            var scrapedFacets = new HashSet<ScrapedFacetLabel>(new ScrapedFacetLabelComparaer());
+            var scrapedFacets = new HashSet<FacetLabel>(new FacetLabelComparaer());
 
             foreach (var facetQuery in this._facetQueries)
             {
@@ -35,7 +35,7 @@ public async Task<ISet<ScrapedFacetLabel>> scrapeFacet(string facetId, string fa
                 {
                     foreach (var label in facet.labels)
                     {
-                        scrapedFacets.Add(new ScrapedFacetLabel { name = label.name, value = label.value });
+                        scrapedFacets.Add(new FacetLabel { name = label.name, value = label.value });
                     }
                 }
             }
@@ -43,9 +43,9 @@ public async Task<ISet<ScrapedFacetLabel>> scrapeFacet(string facetId, string fa
             return scrapedFacets;
         }
 
-        public async Task<IDictionary<string, ISet<ScrapedFacetLabel>>> scrapeFacets()
+        public async Task<IDictionary<string, ISet<FacetLabel>>> scrapeFacets()
         {
-            var result = new Dictionary<string, ISet<ScrapedFacetLabel>>();
+            var result = new Dictionary<string, ISet<FacetLabel>>();
 
             foreach (var facetQuery in this._facetQueries)
             {
@@ -57,11 +57,11 @@ public async Task<ISet<ScrapedFacetLabel>> scrapeFacet(string facetId, string fa
                     var dictionaryIdx = facet.id + "," + facet.key;
                     if (!result.ContainsKey(dictionaryIdx))
                     {
-                        result[dictionaryIdx] = new HashSet<ScrapedFacetLabel>(new ScrapedFacetLabelComparaer());
+                        result[dictionaryIdx] = new HashSet<FacetLabel>(new FacetLabelComparaer());
                     }
                     foreach (var label in facet.labels)
                     {
-                        result[dictionaryIdx].Add(new ScrapedFacetLabel { name = label.name, value = label.value });
+                        result[dictionaryIdx].Add(new FacetLabel { name = label.name, value = label.value });
                     }
                 }
             }
diff --git a/LegoSharp/Scraping/ScrapedFacetLabel.cs b/LegoSharp/Scraping/ScrapedFacetLabel.cs
deleted file mode 100644
index ca977a6..0000000
--- a/LegoSharp/Scraping/ScrapedFacetLabel.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace LegoSharp
-{
-    public struct ScrapedFacetLabel
-    {
-        public string value;
-        public string name;
-    }
-
-    public class ScrapedFacetLabelComparaer : IEqualityComparer<ScrapedFacetLabel>
-    {
-        public bool Equals(ScrapedFacetLabel a, ScrapedFacetLabel b)
-        {
-            return a.value == b.value && a.name == b.name;
-        }
-        public int GetHashCode(ScrapedFacetLabel t)
-        {
-            string code = t.value + "," + t.name;
-            return code.GetHashCode();
-        }
-    }
-}