diff --git a/plugins/chrome/js b/plugins/chrome/js
new file mode 120000
index 00000000..a8d2a675
--- /dev/null
+++ b/plugins/chrome/js
@@ -0,0 +1 @@
+../../src/
\ No newline at end of file
diff --git a/plugins/chrome/openpgp.html b/plugins/chrome/openpgp.html
index 5466ffb2..6b2fc59a 100644
--- a/plugins/chrome/openpgp.html
+++ b/plugins/chrome/openpgp.html
@@ -8,17 +8,17 @@
 <script type="text/javascript" src="js/ciphers/hash/ripe-md.js"></script>
 
 <!-- crypto libs -->
-<script type="text/javascript" src="js/ciphers/symmetricencryption/aes.js"></script>
-<script type="text/javascript" src="js/ciphers/symmetricencryption/cast5.js"></script>
-<script type="text/javascript" src="js/ciphers/symmetricencryption/dessrc.js"></script>
-<script type="text/javascript" src="js/ciphers/symmetricencryption/twofish.js"></script>
-<script type="text/javascript" src="js/ciphers/symmetricencryption/blowfish.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/aes.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/cast5.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/dessrc.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/twofish.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/blowfish.js"></script>
 
-<script type="text/javascript" src="js/ciphers/asymetricencryption/jsbn.js"></script>
-<script type="text/javascript" src="js/ciphers/asymetricencryption/jsbn2.js"></script>
-<script type="text/javascript" src="js/ciphers/asymetricencryption/dsa.js"></script>
-<script type="text/javascript" src="js/ciphers/asymetricencryption/elgamal.js"></script>
-<script type="text/javascript" src="js/ciphers/asymetricencryption/rsa.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/jsbn.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/jsbn2.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/dsa.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/elgamal.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/rsa.js"></script>
 
 <script type="text/javascript" src="js/ciphers/openpgp.crypto.js"></script>
 <script type="text/javascript" src="js/ciphers/openpgp.cfb.js"></script>
@@ -52,12 +52,12 @@
 
 <!--  openpgp impl. -->
 <script type="text/javascript" src="js/openpgp.js"></script>
-<script type="text/javascript" src="js/openpgp.config.js"></script>
+<script type="text/javascript" src="js/config/openpgp.config.js"></script>
 <script type="text/javascript" src="js/openpgp.keyring.js"></script>
 <script type="text/javascript" src="js/openpgp.msg.message.js"></script>
 <script type="text/javascript" src="js/openpgp.msg.privatekey.js"></script>
 <script type="text/javascript" src="js/openpgp.msg.publickey.js"></script>
-<script type="text/javascript" src="js/util.js"></script>
+<script type="text/javascript" src="js/util/util.js"></script>
 
 <title>OpenPGP.js</title>
 </head>
diff --git a/plugins/chrome/options.html b/plugins/chrome/options.html
index 242aa183..24d64e1e 100644
--- a/plugins/chrome/options.html
+++ b/plugins/chrome/options.html
@@ -9,17 +9,17 @@
 <script type="text/javascript" src="js/ciphers/hash/ripe-md.js"></script>
 
 <!-- crypto libs -->
-<script type="text/javascript" src="js/ciphers/symmetricencryption/aes.js"></script>
-<script type="text/javascript" src="js/ciphers/symmetricencryption/cast5.js"></script>
-<script type="text/javascript" src="js/ciphers/symmetricencryption/dessrc.js"></script>
-<script type="text/javascript" src="js/ciphers/symmetricencryption/twofish.js"></script>
-<script type="text/javascript" src="js/ciphers/symmetricencryption/blowfish.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/aes.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/cast5.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/dessrc.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/twofish.js"></script>
+<script type="text/javascript" src="js/ciphers/symmetric/blowfish.js"></script>
 
-<script type="text/javascript" src="js/ciphers/asymetricencryption/jsbn.js"></script>
-<script type="text/javascript" src="js/ciphers/asymetricencryption/jsbn2.js"></script>
-<script type="text/javascript" src="js/ciphers/asymetricencryption/dsa.js"></script>
-<script type="text/javascript" src="js/ciphers/asymetricencryption/elgamal.js"></script>
-<script type="text/javascript" src="js/ciphers/asymetricencryption/rsa.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/jsbn.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/jsbn2.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/dsa.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/elgamal.js"></script>
+<script type="text/javascript" src="js/ciphers/asymmetric/rsa.js"></script>
 
 <script type="text/javascript" src="js/ciphers/openpgp.crypto.js"></script>
 <script type="text/javascript" src="js/ciphers/openpgp.cfb.js"></script>
@@ -53,12 +53,12 @@
 
 <!--  openpgp impl. -->
 <script type="text/javascript" src="js/openpgp.js"></script>
-<script type="text/javascript" src="js/openpgp.config.js"></script>
+<script type="text/javascript" src="js/config/openpgp.config.js"></script>
 <script type="text/javascript" src="js/openpgp.keyring.js"></script>
 <script type="text/javascript" src="js/openpgp.msg.message.js"></script>
 <script type="text/javascript" src="js/openpgp.msg.privatekey.js"></script>
 <script type="text/javascript" src="js/openpgp.msg.publickey.js"></script>
-<script type="text/javascript" src="js/util.js"></script>
+<script type="text/javascript" src="js/util/util.js"></script>
 
 <script type="text/javascript">