diff --git a/src/kademlia/dht/StorageEntry.java b/src/kademlia/dht/StorageEntry.java
index 93d1a13..422914b 100644
--- a/src/kademlia/dht/StorageEntry.java
+++ b/src/kademlia/dht/StorageEntry.java
@@ -9,7 +9,7 @@ package kademlia.dht;
 public class StorageEntry
 {
 
-    private final String content;
+    private final byte[] content;
     private final StorageEntryMetadata metadata;
 
     public StorageEntry(KadContent content)
@@ -19,15 +19,20 @@ public class StorageEntry
 
     public StorageEntry(KadContent content, StorageEntryMetadata metadata)
     {
-        this.content = new String(content.toBytes());
+        this.content = content.toBytes();
         this.metadata = metadata;
     }
 
-    public String getContent()
+    public byte[] getContent()
     {
         return this.content;
     }
 
+    public String getContentString()
+    {
+        return new String(this.content);
+    }
+
     public StorageEntryMetadata getContentMetadata()
     {
         return this.metadata;
diff --git a/src/kademlia/tests/ContentSendingTest.java b/src/kademlia/tests/ContentSendingTest.java
index 92caa98..5cfd038 100644
--- a/src/kademlia/tests/ContentSendingTest.java
+++ b/src/kademlia/tests/ContentSendingTest.java
@@ -41,7 +41,7 @@ public class ContentSendingTest
             gp.setOwnerId(c.getOwnerId());
             System.out.println("Get Parameter: " + gp);
             StorageEntry conte = kad2.get(gp);
-            System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContent().getBytes()));
+            System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContentString().getBytes()));
             System.out.println("Content Metadata: " + conte.getContentMetadata());
 
         }
diff --git a/src/kademlia/tests/ContentUpdatingTest.java b/src/kademlia/tests/ContentUpdatingTest.java
index 9b35883..9d09ad8 100644
--- a/src/kademlia/tests/ContentUpdatingTest.java
+++ b/src/kademlia/tests/ContentUpdatingTest.java
@@ -37,7 +37,7 @@ public class ContentUpdatingTest
             
             System.out.println("Get Parameter: " + gp);
             StorageEntry conte = kad2.get(gp);
-            System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContent().getBytes()));
+            System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContentString().getBytes()));
             System.out.println("Content Metadata: " + conte.getContentMetadata());
 
             /* Lets update the content and put it again */
@@ -47,7 +47,7 @@ public class ContentUpdatingTest
             /* Lets retrieve the content */
             System.out.println("Retrieving Content Again");
             conte = kad2.get(gp);
-            System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContent().getBytes()));
+            System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContentString().getBytes()));
             System.out.println("Content Metadata: " + conte.getContentMetadata());
 
         }
diff --git a/src/kademlia/tests/SaveStateTest2.java b/src/kademlia/tests/SaveStateTest2.java
index a013070..5bb6bba 100644
--- a/src/kademlia/tests/SaveStateTest2.java
+++ b/src/kademlia/tests/SaveStateTest2.java
@@ -53,7 +53,7 @@ public class SaveStateTest2
             /* Trying to get a content stored on the restored node */
             GetParameter gp = new GetParameter(c.getKey(), kad2.getOwnerId(), c.getType());
             StorageEntry content = kad2.get(gp);
-            DHTContentImpl cc = new DHTContentImpl().fromBytes(content.getContent().getBytes());
+            DHTContentImpl cc = new DHTContentImpl().fromBytes(content.getContentString().getBytes());
             System.out.println("Content received: " + cc);
         }
 
diff --git a/src/kademlia/util/hashing/HashCalculator.java b/src/kademlia/util/HashCalculator.java
similarity index 98%
rename from src/kademlia/util/hashing/HashCalculator.java
rename to src/kademlia/util/HashCalculator.java
index 0076cd0..2bd2bab 100644
--- a/src/kademlia/util/hashing/HashCalculator.java
+++ b/src/kademlia/util/HashCalculator.java
@@ -1,4 +1,4 @@
-package kademlia.util.hashing;
+package kademlia.util;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;