diff --git a/docs/members.html b/docs/members.html
index d72fec9..e746bee 100644
--- a/docs/members.html
+++ b/docs/members.html
@@ -651,5 +651,6 @@ <h2 class="section-title">Other</h2>
     </footer>
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="dist/js/solstice.js"></script>
+    <script src="dist/js/eclipsefdn.members-list.js"></script>
   </body>
 </html>
diff --git a/js/api/index.js b/js/api/index.js
index 1d9e022..4fc4321 100644
--- a/js/api/index.js
+++ b/js/api/index.js
@@ -12,7 +12,7 @@
  */
 
 import './eclipsefdn.adopters';
-import './eclipsefdn.members';
+//import './eclipsefdn.members';
 import './eclipsefdn.render-rss';
 import './jquery.eclipsefdn.api';
 //import './eclipsefdn.igc'
\ No newline at end of file
diff --git a/js/solstice/index.js b/js/solstice/index.js
index 9de3736..ab1486f 100644
--- a/js/solstice/index.js
+++ b/js/solstice/index.js
@@ -15,7 +15,6 @@ import './eclipsefdn.block-summary-item'
 import './eclipsefdn.featured-stories'
 import './eclipsefdn.solstice'
 import './eclipsefdn.match-height';
-import './eclipsefdn.members-list';
 import './eclipsefdn.scrollup';
 import './eclipsefdn.sidebar';
 import './eclipsefdn.solstice-slider';
\ No newline at end of file
diff --git a/js/www/eclipsefdn.donate.js b/js/www/donate/eclipsefdn.donate.js
similarity index 100%
rename from js/www/eclipsefdn.donate.js
rename to js/www/donate/eclipsefdn.donate.js
diff --git a/js/solstice/eclipsefdn.members-list.js b/js/www/membership/eclipsefdn.members-list.js
similarity index 87%
rename from js/solstice/eclipsefdn.members-list.js
rename to js/www/membership/eclipsefdn.members-list.js
index d382373..475cbad 100644
--- a/js/solstice/eclipsefdn.members-list.js
+++ b/js/www/membership/eclipsefdn.members-list.js
@@ -11,12 +11,10 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-import $ from 'jquery';
-import 'jquery-match-height';
-import getMembers from '../api/eclipsefdn.members';
+import getMembers from '../../api/eclipsefdn.members';
 import template from './templates/member.mustache';
 
-const EclipseFdnMembersList = (() => {
+const EclipseFdnMembersList = (($) => {
   $('.eclipsefdn-members-list').each(function (index, element) {
     let url = 'https://api.eclipse.org/public/member?pagesize=100';
 
@@ -41,6 +39,6 @@ const EclipseFdnMembersList = (() => {
       })
       .catch(console.error);
   });
-})();
+})($);
 
 export default EclipseFdnMembersList;
diff --git a/js/solstice/templates/member.mustache b/js/www/membership/templates/member.mustache
similarity index 100%
rename from js/solstice/templates/member.mustache
rename to js/www/membership/templates/member.mustache
diff --git a/js/www/eclipsefdn.wiki.js b/js/www/wiki/eclipsefdn.wiki.js
similarity index 100%
rename from js/www/eclipsefdn.wiki.js
rename to js/www/wiki/eclipsefdn.wiki.js
diff --git a/package-lock.json b/package-lock.json
index b6c2722..f71fbe2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4287,6 +4287,15 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
+    "isomorphic-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+      "requires": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      }
+    },
     "isurl": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
@@ -5003,6 +5012,11 @@
         "tslib": "^2.0.3"
       }
     },
+    "node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+    },
     "node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
diff --git a/webpack.mix.js b/webpack.mix.js
index a2d9f0d..5a54cb6 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -64,4 +64,4 @@ mix.less(
 
 mix.js(['js/main.js'], 'docs/dist/js/solstice.js');
 
-mix.js(['js/solstice/eclipsefdn.members-list.js'], 'docs/dist/js/eclipsefdn.members-list.js');
\ No newline at end of file
+mix.js(['js/www/membership/eclipsefdn.members-list.js'], 'docs/dist/js/eclipsefdn.members-list.js');
\ No newline at end of file