37 files changed, 8 insertions, 9 deletions

diff --git a/app.js b/app.js
index 1e8cb145..cef59559 100644
--- a/app.js
+++ b/app.js
@@ -109,8 +109,7 @@
   app.get('/:user', authorize, users.show);
 
   app.use(require('connect-assets')({
-    src: 'public',
-    servePath: '/'
+    src: 'public'
   }));
 
   app.use(function(err, req, res, next) {
diff --git a/public/font/fontawesome-webfont.eot b/public/assets/font/fontawesome-webfont.eot
index 89070c1e..89070c1e 100755
--- a/public/font/fontawesome-webfont.eot
+++ b/public/assets/font/fontawesome-webfont.eot
diff --git a/public/font/fontawesome-webfont.svg b/public/assets/font/fontawesome-webfont.svg
index 1245f92c..1245f92c 100755
--- a/public/font/fontawesome-webfont.svg
+++ b/public/assets/font/fontawesome-webfont.svg
diff --git a/public/font/fontawesome-webfont.ttf b/public/assets/font/fontawesome-webfont.ttf
index c17e9f8d..c17e9f8d 100755
--- a/public/font/fontawesome-webfont.ttf
+++ b/public/assets/font/fontawesome-webfont.ttf
diff --git a/public/font/fontawesome-webfont.woff b/public/assets/font/fontawesome-webfont.woff
index 09f2469a..09f2469a 100755
--- a/public/font/fontawesome-webfont.woff
+++ b/public/assets/font/fontawesome-webfont.woff
diff --git a/public/fonts/glyphicons-halflings-regular.eot b/public/assets/fonts/glyphicons-halflings-regular.eot
index 4a4ca865..4a4ca865 100644
--- a/public/fonts/glyphicons-halflings-regular.eot
+++ b/public/assets/fonts/glyphicons-halflings-regular.eot
diff --git a/public/fonts/glyphicons-halflings-regular.svg b/public/assets/fonts/glyphicons-halflings-regular.svg
index e3e2dc73..e3e2dc73 100644
--- a/public/fonts/glyphicons-halflings-regular.svg
+++ b/public/assets/fonts/glyphicons-halflings-regular.svg
diff --git a/public/fonts/glyphicons-halflings-regular.ttf b/public/assets/fonts/glyphicons-halflings-regular.ttf
index 67fa00bf..67fa00bf 100644
--- a/public/fonts/glyphicons-halflings-regular.ttf
+++ b/public/assets/fonts/glyphicons-halflings-regular.ttf
diff --git a/public/fonts/glyphicons-halflings-regular.woff b/public/assets/fonts/glyphicons-halflings-regular.woff
index 8c54182a..8c54182a 100644
--- a/public/fonts/glyphicons-halflings-regular.woff
+++ b/public/assets/fonts/glyphicons-halflings-regular.woff
diff --git a/public/css/images/animated-overlay.gif b/public/assets/images/animated-overlay.gif
index d441f75e..d441f75e 100644
--- a/public/css/images/animated-overlay.gif
+++ b/public/assets/images/animated-overlay.gif
diff --git a/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png
index 9aab30b1..9aab30b1 100644
--- a/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/public/css/images/ui-bg_flat_75_ffffff_40x100.png b/public/assets/images/ui-bg_flat_75_ffffff_40x100.png
index 0b2088de..0b2088de 100644
--- a/public/css/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/public/assets/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png
index b1e1380b..b1e1380b 100644
--- a/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/public/css/images/ui-bg_glass_65_ffffff_1x400.png b/public/assets/images/ui-bg_glass_65_ffffff_1x400.png
index 0850cce5..0850cce5 100644
--- a/public/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/public/assets/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/css/images/ui-bg_glass_75_dadada_1x400.png b/public/assets/images/ui-bg_glass_75_dadada_1x400.png
index 7d57debb..7d57debb 100644
--- a/public/css/images/ui-bg_glass_75_dadada_1x400.png
+++ b/public/assets/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png
index 4061d4a2..4061d4a2 100644
--- a/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/public/css/images/ui-bg_glass_95_fef1ec_1x400.png b/public/assets/images/ui-bg_glass_95_fef1ec_1x400.png
index 83e61bc8..83e61bc8 100644
--- a/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/public/assets/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7d58f386..7d58f386 100644
--- a/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/public/css/images/ui-icons_222222_256x240.png b/public/assets/images/ui-icons_222222_256x240.png
index c1cb1170..c1cb1170 100644
--- a/public/css/images/ui-icons_222222_256x240.png
+++ b/public/assets/images/ui-icons_222222_256x240.png
diff --git a/public/css/images/ui-icons_2e83ff_256x240.png b/public/assets/images/ui-icons_2e83ff_256x240.png
index 84b601bf..84b601bf 100644
--- a/public/css/images/ui-icons_2e83ff_256x240.png
+++ b/public/assets/images/ui-icons_2e83ff_256x240.png
diff --git a/public/css/images/ui-icons_454545_256x240.png b/public/assets/images/ui-icons_454545_256x240.png
index b6db1acd..b6db1acd 100644
--- a/public/css/images/ui-icons_454545_256x240.png
+++ b/public/assets/images/ui-icons_454545_256x240.png
diff --git a/public/css/images/ui-icons_888888_256x240.png b/public/assets/images/ui-icons_888888_256x240.png
index feea0e20..feea0e20 100644
--- a/public/css/images/ui-icons_888888_256x240.png
+++ b/public/assets/images/ui-icons_888888_256x240.png
diff --git a/public/css/images/ui-icons_cd0a0a_256x240.png b/public/assets/images/ui-icons_cd0a0a_256x240.png
index ed5b6b09..ed5b6b09 100644
--- a/public/css/images/ui-icons_cd0a0a_256x240.png
+++ b/public/assets/images/ui-icons_cd0a0a_256x240.png
diff --git a/public/img/bitcoin.png b/public/assets/img/bitcoin.png
index 148d0c0b..148d0c0b 100644
--- a/public/img/bitcoin.png
+++ b/public/assets/img/bitcoin.png
diff --git a/public/img/bitcoin_coop.png b/public/assets/img/bitcoin_coop.png
index 7e204c4f..7e204c4f 100644
--- a/public/img/bitcoin_coop.png
+++ b/public/assets/img/bitcoin_coop.png
diff --git a/public/img/blockchain.png b/public/assets/img/blockchain.png
index 1d620cbe..1d620cbe 100644
--- a/public/img/blockchain.png
+++ b/public/assets/img/blockchain.png
diff --git a/public/img/coinos_logo.png b/public/assets/img/coinos_logo.png
index d95b54e3..d95b54e3 100644
--- a/public/img/coinos_logo.png
+++ b/public/assets/img/coinos_logo.png
diff --git a/public/img/coinos_logo.svg b/public/assets/img/coinos_logo.svg
index 18dcf824..18dcf824 100644
--- a/public/img/coinos_logo.svg
+++ b/public/assets/img/coinos_logo.svg
diff --git a/public/img/favicon.ico b/public/assets/img/favicon.ico
index e8aac8a4..e8aac8a4 100644
--- a/public/img/favicon.ico
+++ b/public/assets/img/favicon.ico
diff --git a/public/img/glyphicons-halflings-white.png b/public/assets/img/glyphicons-halflings-white.png
index 3bf6484a..3bf6484a 100644
--- a/public/img/glyphicons-halflings-white.png
+++ b/public/assets/img/glyphicons-halflings-white.png
diff --git a/public/img/glyphicons-halflings.png b/public/assets/img/glyphicons-halflings.png
index a9969993..a9969993 100644
--- a/public/img/glyphicons-halflings.png
+++ b/public/assets/img/glyphicons-halflings.png
diff --git a/public/img/qr.png b/public/assets/img/qr.png
index c17101e7..c17101e7 100644
--- a/public/img/qr.png
+++ b/public/assets/img/qr.png
diff --git a/public/js/calculator.coffee b/public/js/calculator.coffee
index 2f004426..2c8a33f0 100644
--- a/public/js/calculator.coffee
+++ b/public/js/calculator.coffee
@@ -75,12 +75,12 @@ setup = ->
   if g.logo
     $('#logo').attr('src', g.logo).show()
   else unless g.title
-    $('#logo').attr('src', 'img/bitcoin.png').show()
+    $('#logo').attr('src', '/assets/img/bitcoin.png').show()
 
   $('#logo').click -> $(location).attr("href","/#{g.user}/edit")
   address = g.address
   if g.user? and g.user
-    address = "#{address} <a href='http://blockchain.info/address/#{address}' target='_blank'><img src='/img/blockchain.png' /></a>"
+    address = "#{address} <a href='http://blockchain.info/address/#{address}' target='_blank'><img src='/assets/img/blockchain.png' /></a>"
 
   if check_address(g.address)
     $('#address').html(address)
diff --git a/public/js/index.coffee b/public/js/index.coffee
index 8fffa607..090abbe2 100644
--- a/public/js/index.coffee
+++ b/public/js/index.coffee
@@ -1,5 +1,5 @@
-#= require jquery-1.8.2.min.js
-#= require bootstrap.js
+#= require js/jquery-1.8.2.min.js
+#= require js/bootstrap.min.js
 
 g = exports ? this
 
diff --git a/src/app.coffee b/src/app.coffee
index 538dfa05..3b042c5b 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -57,7 +57,7 @@ app.get('/:user/report', authorize, transactions.index)
 app.get('/:user.json', authorize, users.json)
 app.get('/:user', authorize, users.show)
 
-app.use(require('connect-assets')(src: 'public', servePath: '/'))
+app.use(require('connect-assets')(src: 'public'))
 
 app.use((err, req, res, next) ->
   res.status(500)
diff --git a/views/layout.html b/views/layout.html
index 651d01ef..49669fa0 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -3,7 +3,7 @@
     <meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, height=752, user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1" />
     <title>CoinOS</title>
-    <link href="img/favicon.ico" rel="shortcut icon" />
+    <link href="/assets/img/favicon.ico" rel="shortcut icon" />
     {{#css}}css/calculator{{/css}}
     {{{yield-styles}}}
     {{{yield-scripts}}}
diff --git a/views/users/show.html b/views/users/show.html
index 608246e0..8ecce37a 100644
--- a/views/users/show.html
+++ b/views/users/show.html
@@ -6,7 +6,7 @@
   <input id="user" type="hidden" value="{{user}}" />
 
   <h1 id="title"></h1>
-  <img id="logo" src="img/bitcoin.png" alt="Logo" />
+  <img id="logo" src="/assets/img/bitcoin.png" alt="Logo" />
 
   <form role="form">
     <div class="form-group">