diff --git a/js/KeyLocator.js b/js/Key.js
similarity index 94%
rename from js/KeyLocator.js
rename to js/Key.js
index 0a73cb5..d495fe3 100644
--- a/js/KeyLocator.js
+++ b/js/Key.js
@@ -1,8 +1,23 @@
 /*
  * @author: ucla-cs
- * This class represents KeyLocator Objects
+ * This class represents Key Objects
  */
 
+var Key = function Key(){
+    /* TODO: Port from PyCCN:
+	generateRSA()
+	privateToDER()
+	publicToDER()
+	privateToPEM()
+	publicToPEM()
+	fromDER()
+	fromPEM()
+     */
+}
+
+/**
+ * KeyLocator
+ */
 var KeyLocatorType = {
 	  NAME:1,
 	  KEY:2,
diff --git a/js/DateFormat.js b/js/encoding/DateFormat.js
similarity index 100%
rename from js/DateFormat.js
rename to js/encoding/DateFormat.js
diff --git a/js/testing/image-loader.html b/js/testing/image-loader.html
index f884678..6a033b1 100644
--- a/js/testing/image-loader.html
+++ b/js/testing/image-loader.html
@@ -7,19 +7,19 @@
 	<title>NDN Image Loader</title>
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/image-sender.html b/js/testing/image-sender.html
index 6813c2e..f0bc589 100644
--- a/js/testing/image-sender.html
+++ b/js/testing/image-sender.html
@@ -7,19 +7,19 @@
 	<title>NDN Image Sender</title>
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-connection.html b/js/testing/test-connection.html
index c66ee27..7bfcb92 100644
--- a/js/testing/test-connection.html
+++ b/js/testing/test-connection.html
@@ -7,19 +7,19 @@
 	<title>Test Connection</title>
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-decode-FaceInstance.html b/js/testing/test-decode-FaceInstance.html
index 360cd68..5c4b723 100644
--- a/js/testing/test-decode-FaceInstance.html
+++ b/js/testing/test-decode-FaceInstance.html
@@ -8,19 +8,19 @@
 	
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-decode-Interest+Forwarding+Entry.html b/js/testing/test-decode-Interest+Forwarding+Entry.html
index 9607cdc..633b222 100644
--- a/js/testing/test-decode-Interest+Forwarding+Entry.html
+++ b/js/testing/test-decode-Interest+Forwarding+Entry.html
@@ -8,19 +8,19 @@
 	
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-encode-decode-ContentObject-bis.html b/js/testing/test-encode-decode-ContentObject-bis.html
index 0dcf377..b8c45db 100644
--- a/js/testing/test-encode-decode-ContentObject-bis.html
+++ b/js/testing/test-encode-decode-ContentObject-bis.html
@@ -8,19 +8,19 @@
 	
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-encode-decode-ContentObject.html b/js/testing/test-encode-decode-ContentObject.html
index ca76d4c..55d80ed 100644
--- a/js/testing/test-encode-decode-ContentObject.html
+++ b/js/testing/test-encode-decode-ContentObject.html
@@ -8,9 +8,9 @@
 	
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
@@ -18,7 +18,7 @@
 		
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-encode-decode-Interest.html b/js/testing/test-encode-decode-Interest.html
index 0fb0f4b..35f8538 100644
--- a/js/testing/test-encode-decode-Interest.html
+++ b/js/testing/test-encode-decode-Interest.html
@@ -8,19 +8,19 @@
 	
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-get.html b/js/testing/test-get.html
index be3cbbb..3eabf75 100644
--- a/js/testing/test-get.html
+++ b/js/testing/test-get.html
@@ -9,19 +9,19 @@
 	
 	<script type="text/javascript" src="../NDN.js"></script>
         
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-interest-matches-name.html b/js/testing/test-interest-matches-name.html
index 70039fa..e686d1e 100644
--- a/js/testing/test-interest-matches-name.html
+++ b/js/testing/test-interest-matches-name.html
@@ -8,19 +8,19 @@
 	
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-put.html b/js/testing/test-put.html
index 02ec425..ba75093 100644
--- a/js/testing/test-put.html
+++ b/js/testing/test-put.html
@@ -7,19 +7,19 @@
 	<title>NDN Put</title>
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/testing/test-request-send-hex.html b/js/testing/test-request-send-hex.html
index d38d706..333e01b 100644
--- a/js/testing/test-request-send-hex.html
+++ b/js/testing/test-request-send-hex.html
@@ -7,19 +7,19 @@
 	<title>NDN Send Hex</title>
 	<script type="text/javascript" src="../java_socket_bridge.js"></script>
 	
-	<script type="text/javascript" src="../CCNProtocolDTags.js"></script>
+	<script type="text/javascript" src="../util/CCNProtocolDTags.js"></script>
 	
-	<script type="text/javascript" src="../CCNTime.js"></script>
+	<script type="text/javascript" src="../util/CCNTime.js"></script>
 	
 	<script type="text/javascript" src="../Name.js"></script>
 	
 	<script type="text/javascript" src="../ContentObject.js"></script>
 	
-	<script type="text/javascript" src="../DateFormat.js"></script>
+	<script type="text/javascript" src="../encoding/DateFormat.js"></script>
 	
 	<script type="text/javascript" src="../Interest.js"></script>
 	
-	<script type="text/javascript" src="../KeyLocator.js"></script>
+	<script type="text/javascript" src="../Key.js"></script>
 	
 	<script type="text/javascript" src="../PublisherID.js"></script>
 	
diff --git a/js/CCNProtocolDTags.js b/js/util/CCNProtocolDTags.js
similarity index 100%
rename from js/CCNProtocolDTags.js
rename to js/util/CCNProtocolDTags.js
diff --git a/js/CCNTime.js b/js/util/CCNTime.js
similarity index 100%
rename from js/CCNTime.js
rename to js/util/CCNTime.js