diff --git a/_data/completed-proposals.json b/_data/completed-proposals.json
index a7a7b56f4bfea2f415850fa26302389aef9dcdfb..ede96fc893439b2eb78d2876f39471c1d64eba97 100644
--- a/_data/completed-proposals.json
+++ b/_data/completed-proposals.json
@@ -4,79 +4,79 @@
       "proposals": [
          {
             "name": "Documentation and cleanup of source code",
-            "local-url": "/forum-funding-system/proposals/documentation-cleanup.html",
+            "local-url": "/proposals/documentation-cleanup.html",
             "author": "tewinget",
             "date": null
          },
          {
             "name": "What is Monero? is produced and open-sourced",
-            "local-url": "/forum-funding-system/proposals/whatismonero-produced.html",
+            "local-url": "/proposals/whatismonero-produced.html",
             "author": "savandra",
             "date": null
          },
          {
             "name": "Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples",
-            "local-url": "/forum-funding-system/proposals/improve-devguides-simplewallet.html",
+            "local-url": "/proposals/improve-devguides-simplewallet.html",
             "author": "bigredmachine",
             "date": null
          },
          {
             "name": "A continuation for all purpose programming of what needs to get done in monero",
-            "local-url": "/forum-funding-system/proposals/mooo-continuation-programming.html",
+            "local-url": "/proposals/mooo-continuation-programming.html",
             "author": "moneromooo",
             "date": null
          },
          {
             "name": "Create End-User Kovri documentation",
-            "local-url": "/forum-funding-system/proposals/kovri-end-user-docs.html",
+            "local-url": "/proposals/kovri-end-user-docs.html",
             "author": "anonimal",
             "date": null
          },
          {
             "name": "fluffypony's Conference Circuit Jan 2017 Edition",
-            "local-url": "/forum-funding-system/proposals/fp-conference-2017.html",
+            "local-url": "/proposals/fp-conference-2017.html",
             "author": "fluffypony",
             "date": null
          },
          {
             "name": "The official Qt GUI Project",
-            "local-url": "/forum-funding-system/proposals/official-qt-gui.html",
+            "local-url": "/proposals/official-qt-gui.html",
             "author": "othe",
             "date": null
          },
          {
             "name": "Justin's Local Meetup Talks Proposal 1",
-            "local-url": "/forum-funding-system/proposals/justin-local-meetups-1.html",
+            "local-url": "/proposals/justin-local-meetups-1.html",
             "author": "samsunggalaxyplayer",
             "date": null
          },
          {
             "name": "Justin's Local Meetup Talks Proposal 2",
-            "local-url": "/forum-funding-system/proposals/justin-local-meetups-2.html",
+            "local-url": "/proposals/justin-local-meetups-2.html",
             "author": "samsunggalaxyplayer",
             "date": null
          },
          {
             "name": "More mooo coding goodness",
-            "local-url": "/forum-funding-system/proposals/more-mooo-coding-goodness.html",
+            "local-url": "/proposals/more-mooo-coding-goodness.html",
             "author": "moneromooo",
             "date": null
          },
          {
             "name": "Funding for a Monero subforum on the largest chinese BTC forum 8BTC",
-            "local-url": "/forum-funding-system/proposals/monero-subforum-8btc.html",
+            "local-url": "/proposals/monero-subforum-8btc.html",
             "author": "firperfect",
             "date": null
          },
          {
             "name": "Additional GUI Developer",
-            "local-url": "/forum-funding-system/proposals/additional-gui-dev.html",
+            "local-url": "/proposals/additional-gui-dev.html",
             "author": "Jaquee",
             "date": null
          },
          {
             "name": "Release of new/updated pool software",
-            "local-url": "/forum-funding-system/proposals/release-pool-software.html",
+            "local-url": "/proposals/release-pool-software.html",
             "author": "Snipa22",
             "date": null
          },
diff --git a/_data/ffs.json b/_data/proposals.json
similarity index 83%
rename from _data/ffs.json
rename to _data/proposals.json
index 96588353b214de1a8121b252e098bb5fcd2b7da6..c9ceeff3971fb00259ee15f488bead5de209a4aa 100644
--- a/_data/ffs.json
+++ b/_data/proposals.json
@@ -16,7 +16,7 @@
          {
             "name": "Monero Bounty For HackerOne",
             "gitlab-url": null,
-            "local-url": "/forum-funding-system/proposals/monero-bounty-hackerone.html",
+            "local-url": "/proposals/monero-bounty-hackerone.html",
             "author": "anonimal",
             "amount": 1500,
             "amount-funded": 1447.21,
@@ -32,7 +32,7 @@
          {
             "name": "Getmonero.org Redesign",
             "gitlab-url": null,
-            "local-url": "/forum-funding-system/proposals/getmonero-redesign.html",
+            "local-url": "/proposals/getmonero-redesign.html",
             "author": "rehrar",
             "date": "February 24, 2017",
             "milestones": 4,
diff --git a/_layouts/ffs-cp.html b/_layouts/cp.html
similarity index 100%
rename from _layouts/ffs-cp.html
rename to _layouts/cp.html
diff --git a/_layouts/ffs-fr.html b/_layouts/fr.html
similarity index 98%
rename from _layouts/ffs-fr.html
rename to _layouts/fr.html
index 87f4530546e6ad2cf4ee303fe5d88b026b757e43..bae370a84ec0634f7d370c9186bc7d7d8abb4d36 100644
--- a/_layouts/ffs-fr.html
+++ b/_layouts/fr.html
@@ -48,7 +48,7 @@ layout: base
                 <div class="info-block">
                    <div class="row">
                         <div class="col-xs-12"> 
-                           {% for toplevel in site.data.ffs %}
+                           {% for toplevel in site.data.proposals %}
                              {% if toplevel.stage == "Funding Required" %}
                                 {% for proposal in toplevel.proposals%}
                                   {% if proposal.name == {{page.title}} %}
diff --git a/_layouts/ffs-ideas.html b/_layouts/ideas.html
similarity index 100%
rename from _layouts/ffs-ideas.html
rename to _layouts/ideas.html
diff --git a/_layouts/ffs-wip.html b/_layouts/wip.html
similarity index 98%
rename from _layouts/ffs-wip.html
rename to _layouts/wip.html
index 7b6419d9ff91c336b2d8a2726f8c9efa1e72b7da..dc131e5b834c5153cece06d726bd48cee98bbaf5 100644
--- a/_layouts/ffs-wip.html
+++ b/_layouts/wip.html
@@ -18,7 +18,7 @@ layout: base
                 <div class="info-block">
                    <div class="row">
                         <div class="col-xs-12">
-                           {% for toplevel in site.data.ffs %}
+                           {% for toplevel in site.data.proposals %}
                              {% if toplevel.stage == "Work in Progress" %}
                                 {% for proposal in toplevel.proposals%}
                                   {% if proposal.name == {{page.title}} %}
diff --git a/funding-required/index.html b/funding-required/index.html
index 8f7cd236bedcee47ea90cd2a12f91e1762e1bffc..ff160548343edde4ae42e8ad198e5a46abcdedf5 100644
--- a/funding-required/index.html
+++ b/funding-required/index.html
@@ -17,7 +17,7 @@ title: Funding Required
         <div class="col-xs-12">
             <h1>{{page.title}}</h1>
         </div>
-            {% for toplevel in site.data.ffs %}
+            {% for toplevel in site.data.proposals %}
                 {% if toplevel.stage == "Funding Required" %}
                     {% for proposal in toplevel.proposals%}
                         <div class="col-xs-12">
diff --git a/ideas/index.html b/ideas/index.html
index 18e11a8c7cb52690aca224fa289408d5879ce751..374fcc45591cbe5afc4bf6c24e6cdb8f525d7d36 100644
--- a/ideas/index.html
+++ b/ideas/index.html
@@ -20,7 +20,7 @@ title: Ideas
         <div class="col-xs-12">
             <h1>{{page.title}}</h1>
         </div>
-            {% for toplevel in site.data.ffs %}
+            {% for toplevel in site.data.proposals %}
                 {% if toplevel.stage == "Ideas" %}
                     {% for proposal in toplevel.proposals%}
                         <div class="col-xs-12">
diff --git a/work-in-progress/index.html b/work-in-progress/index.html
index a231680f4608ac0bd01c2bcfe41bedb7b21f2a75..d1a414c73708062da83d893bdd35922e2e5b210c 100644
--- a/work-in-progress/index.html
+++ b/work-in-progress/index.html
@@ -17,7 +17,7 @@ title: Work in Progress
         <div class="col-xs-12">
             <h1>{{page.title}}</h1>
         </div>
-            {% for toplevel in site.data.ffs %}
+            {% for toplevel in site.data.proposals %}
                 {% if toplevel.stage == "Work in Progress" %}
                     {% for proposal in toplevel.proposals%}
                         <div class="col-xs-12">