diff --git a/.gitignore b/.gitignore
index ca35be08d4..9263a1ed65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 _site
+.DS_Store
diff --git a/_includes/sips-topbar.txt b/_includes/sips-topbar.txt
index 13464d1c19..1dc5dd9326 100644
--- a/_includes/sips-topbar.txt
+++ b/_includes/sips-topbar.txt
@@ -3,7 +3,7 @@
     <div class="topbar" >
       <div class="topbar-inner">
         <div class="container">
-          <a class="brand" href="{{ site.baseurl }}/sips/index.html"><img src="{{ site.baseurl }}/images/scala-logo.png"> Improvement Process</a>
+          <a class="brand" href="{{ site.baseurl }}/sips/index.html"><img src="{{ site.baseurl }}/resources/images/scala-logo.png"> Improvement Process</a>
           <ul class="nav">
            <li><a href="{{ site.baseurl }}/sips/sip-submission.html">Submitting a new SIP</a></li>
            <li><a href="{{ site.baseurl }}/sips/sip-list.html">SIP List</a></li>
diff --git a/_includes/topbar.txt b/_includes/topbar.txt
index feb4ba7d1c..5de738a28c 100644
--- a/_includes/topbar.txt
+++ b/_includes/topbar.txt
@@ -3,7 +3,7 @@
     <div class="topbar" >
       <div class="topbar-inner">
         <div class="container">
-          <a class="brand" href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/images/scala-logo.png"> Documentation</a>
+          <a class="brand" href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/images/scala-logo.png"> Documentation</a>
           <ul class="nav">
             <li class="active"><a href="#overview">Empty</a></li>
            <li><a href="#grid-system">Empty</a></li>
diff --git a/_layouts/default.html b/_layouts/default.html
index aebc1663f4..af8bb052c0 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,17 +8,17 @@
     {% endif %}
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 
-    <link rel="icon" type="image/png" href="{{ site.baseurl }}/favicon.ico">
+    <link rel="icon" type="image/png" href="{{ site.baseurl }}/resources/favicon.ico">
 
     <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="{{ site.baseurl }}/stylesheets/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
 
     <!-- prettify js and CSS -->
-    <link rel="stylesheet" href="{{ site.baseurl }}/stylesheets/prettify.css" type="text/css" />
-    <script src="{{ site.baseurl }}/javascript/prettify/prettify.js" type="text/javascript" ></script>
+    <link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/prettify.css" type="text/css" />
+    <script src="{{ site.baseurl }}/resources/javascript/prettify/prettify.js" type="text/javascript" ></script>
 
     <!-- jquery js -->
-    <script src="{{ site.baseurl }}/javascript/jquery.js" type="text/javascript" ></script>
+    <script src="{{ site.baseurl }}/resources/javascript/jquery.js" type="text/javascript" ></script>
 
     <script type="text/javascript">
       function styleCode() 
diff --git a/favicon.ico b/resources/favicon.ico
similarity index 100%
rename from favicon.ico
rename to resources/favicon.ico
diff --git a/images/scala-logo.png b/resources/images/scala-logo.png
similarity index 100%
rename from images/scala-logo.png
rename to resources/images/scala-logo.png
diff --git a/javascript/bootstrap-popover.js b/resources/javascript/bootstrap-popover.js
similarity index 100%
rename from javascript/bootstrap-popover.js
rename to resources/javascript/bootstrap-popover.js
diff --git a/javascript/bootstrap-twipsy.js b/resources/javascript/bootstrap-twipsy.js
similarity index 100%
rename from javascript/bootstrap-twipsy.js
rename to resources/javascript/bootstrap-twipsy.js
diff --git a/javascript/jquery.js b/resources/javascript/jquery.js
similarity index 100%
rename from javascript/jquery.js
rename to resources/javascript/jquery.js
diff --git a/javascript/prettify/.DS_Store b/resources/javascript/prettify/.DS_Store
similarity index 100%
rename from javascript/prettify/.DS_Store
rename to resources/javascript/prettify/.DS_Store
diff --git a/javascript/prettify/lang-apollo.js b/resources/javascript/prettify/lang-apollo.js
similarity index 100%
rename from javascript/prettify/lang-apollo.js
rename to resources/javascript/prettify/lang-apollo.js
diff --git a/javascript/prettify/lang-clj.js b/resources/javascript/prettify/lang-clj.js
similarity index 100%
rename from javascript/prettify/lang-clj.js
rename to resources/javascript/prettify/lang-clj.js
diff --git a/javascript/prettify/lang-css.js b/resources/javascript/prettify/lang-css.js
similarity index 100%
rename from javascript/prettify/lang-css.js
rename to resources/javascript/prettify/lang-css.js
diff --git a/javascript/prettify/lang-go.js b/resources/javascript/prettify/lang-go.js
similarity index 100%
rename from javascript/prettify/lang-go.js
rename to resources/javascript/prettify/lang-go.js
diff --git a/javascript/prettify/lang-hs.js b/resources/javascript/prettify/lang-hs.js
similarity index 100%
rename from javascript/prettify/lang-hs.js
rename to resources/javascript/prettify/lang-hs.js
diff --git a/javascript/prettify/lang-lisp.js b/resources/javascript/prettify/lang-lisp.js
similarity index 100%
rename from javascript/prettify/lang-lisp.js
rename to resources/javascript/prettify/lang-lisp.js
diff --git a/javascript/prettify/lang-lua.js b/resources/javascript/prettify/lang-lua.js
similarity index 100%
rename from javascript/prettify/lang-lua.js
rename to resources/javascript/prettify/lang-lua.js
diff --git a/javascript/prettify/lang-ml.js b/resources/javascript/prettify/lang-ml.js
similarity index 100%
rename from javascript/prettify/lang-ml.js
rename to resources/javascript/prettify/lang-ml.js
diff --git a/javascript/prettify/lang-n.js b/resources/javascript/prettify/lang-n.js
similarity index 100%
rename from javascript/prettify/lang-n.js
rename to resources/javascript/prettify/lang-n.js
diff --git a/javascript/prettify/lang-proto.js b/resources/javascript/prettify/lang-proto.js
similarity index 100%
rename from javascript/prettify/lang-proto.js
rename to resources/javascript/prettify/lang-proto.js
diff --git a/javascript/prettify/lang-scala.js b/resources/javascript/prettify/lang-scala.js
similarity index 100%
rename from javascript/prettify/lang-scala.js
rename to resources/javascript/prettify/lang-scala.js
diff --git a/javascript/prettify/lang-sql.js b/resources/javascript/prettify/lang-sql.js
similarity index 100%
rename from javascript/prettify/lang-sql.js
rename to resources/javascript/prettify/lang-sql.js
diff --git a/javascript/prettify/lang-tex.js b/resources/javascript/prettify/lang-tex.js
similarity index 100%
rename from javascript/prettify/lang-tex.js
rename to resources/javascript/prettify/lang-tex.js
diff --git a/javascript/prettify/lang-vb.js b/resources/javascript/prettify/lang-vb.js
similarity index 100%
rename from javascript/prettify/lang-vb.js
rename to resources/javascript/prettify/lang-vb.js
diff --git a/javascript/prettify/lang-vhdl.js b/resources/javascript/prettify/lang-vhdl.js
similarity index 100%
rename from javascript/prettify/lang-vhdl.js
rename to resources/javascript/prettify/lang-vhdl.js
diff --git a/javascript/prettify/lang-wiki.js b/resources/javascript/prettify/lang-wiki.js
similarity index 100%
rename from javascript/prettify/lang-wiki.js
rename to resources/javascript/prettify/lang-wiki.js
diff --git a/javascript/prettify/lang-xq.js b/resources/javascript/prettify/lang-xq.js
similarity index 100%
rename from javascript/prettify/lang-xq.js
rename to resources/javascript/prettify/lang-xq.js
diff --git a/javascript/prettify/lang-yaml.js b/resources/javascript/prettify/lang-yaml.js
similarity index 100%
rename from javascript/prettify/lang-yaml.js
rename to resources/javascript/prettify/lang-yaml.js
diff --git a/javascript/prettify/prettify.css b/resources/javascript/prettify/prettify.css
similarity index 100%
rename from javascript/prettify/prettify.css
rename to resources/javascript/prettify/prettify.css
diff --git a/javascript/prettify/prettify.js b/resources/javascript/prettify/prettify.js
similarity index 100%
rename from javascript/prettify/prettify.js
rename to resources/javascript/prettify/prettify.js
diff --git a/stylesheets/bootstrap.css b/resources/stylesheets/bootstrap.css
similarity index 100%
rename from stylesheets/bootstrap.css
rename to resources/stylesheets/bootstrap.css
diff --git a/stylesheets/custom.css b/resources/stylesheets/custom.css
similarity index 100%
rename from stylesheets/custom.css
rename to resources/stylesheets/custom.css
diff --git a/stylesheets/docs.css b/resources/stylesheets/docs.css
similarity index 100%
rename from stylesheets/docs.css
rename to resources/stylesheets/docs.css
diff --git a/stylesheets/prettify.css b/resources/stylesheets/prettify.css
similarity index 100%
rename from stylesheets/prettify.css
rename to resources/stylesheets/prettify.css
diff --git a/stylesheets/screen.css b/resources/stylesheets/screen.css
similarity index 100%
rename from stylesheets/screen.css
rename to resources/stylesheets/screen.css
diff --git a/stylesheets/syntax.css b/resources/stylesheets/syntax.css
similarity index 100%
rename from stylesheets/syntax.css
rename to resources/stylesheets/syntax.css
diff --git a/sips/pending/_posts/2011-10-12-implicit-classes.md b/sips/pending/_posts/2011-10-12-implicit-classes.md
index 67bfbd790b..bb1dfb914d 100644
--- a/sips/pending/_posts/2011-10-12-implicit-classes.md
+++ b/sips/pending/_posts/2011-10-12-implicit-classes.md
@@ -1,6 +1,7 @@
 ---
 layout: default
 type: sip
+disqus: true
 title: SIP-13 - Implicit classes
 ---