diff --git a/example/aframe/sandbox/index.html b/example/aframe/sandbox/index.html
index 68b0078..61e93e5 100644
--- a/example/aframe/sandbox/index.html
+++ b/example/aframe/sandbox/index.html
@@ -5,15 +5,11 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-    <!-- <script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>                                       -->
-    <!-- <script src="https://cdn.jsdelivr.net/npm/aframe-blink-controls/dist/aframe-blink-controls.min.js"></script> -->
-    <script src="./../../../dist/aframe.min.js"></script>
-    <script src="./../../../dist/aframe-blink-controls.min.js"></script>
+    <script src="./../../../dist/aframe.min.js"></script> <!-- v1.5.0 -->
+    <script src="./../../../dist/xrfragment.aframe.js"></script>
 
   </head>
   <body>
-    <script src="./../../../dist/xrfragment.aframe.js"></script>
-    <script src="./../../../dist/xrfragment.extras.js"></script>
 
     <a-scene xr-mode-ui="XRMode: xr"  renderer="colorManagement: true; highRefreshRate:true" light="defaultLightsEnabled: false">
       <a-entity id="player" wasd-controls look-controls>
@@ -30,9 +26,15 @@
       <a-entity id="home" xrf="index.glb" xrf-menu></a-entity>
     </a-scene>
 
+    <!-- OPTIONAL                                                                                            -->
+    <!--                                                                                                     -->
+    <!-- everything below is completely optional, but handy to add a quick menu / connectivity to your space -->
+    <!--                                                                                                     -->
+    <script src="./../../../dist/aframe-blink-controls.min.js"></script>  <!-- teleporting using controllers -->
+    <script src="./../../../dist/xrfragment.plugin.frontend.js"></script> <!-- menu + chat interface         -->
+    <script src="./../../../dist/xrfragment.plugin.p2p.js"></script>      <!-- serverless p2p connectivity   -->
+    <script src="./../../../dist/xrfragment.plugin.matrix.js"></script>   <!-- matrix connectivity           -->
     <script>
-      // xrfragment.extras.js is totally optional but can be handy
-      // to quickly add a menu, logo, buttons, serverless meeting-functionality etc
       $menu.logo      = 'logo_file_or_url_here'
       $menu.morelabel = '⚡'
       // add your menubuttons:
diff --git a/make b/make
index dfe9bbf..ca55173 100755
--- a/make
+++ b/make
@@ -85,8 +85,10 @@ build(){
         src/3rd/js/aframe/*.js   \
         example/assets/js/qr.js  > dist/xrfragment.aframe.js
 
-    # html extras like menu & meetings
-    cat src/3rd/js/extra/*.js dist/matrix-crdt.js src/3rd/js/extra/network/*.js dist/trystero-torrent.min.js > dist/xrfragment.extras.js 
+    # plugins  
+    cat src/3rd/js/plugin/frontend/*.js                           > dist/xrfragment.plugin.frontend.js
+    cat src/3rd/js/plugin/matrix/{matrix-crdt,matrix}.js          > dist/xrfragment.plugin.matrix.js 
+    cat src/3rd/js/plugin/p2p/{trystero-torrent.min,trystero}.js  > dist/xrfragment.plugin.p2p.js 
     
     # fat all-in-one standalone xrf release
     test -f dist/aframe.min.js || {
diff --git a/dist/matrix-crdt.js b/src/3rd/js/plugin/matrix/matrix-crdt.js
similarity index 100%
rename from dist/matrix-crdt.js
rename to src/3rd/js/plugin/matrix/matrix-crdt.js
diff --git a/src/3rd/js/plugin/matrix/webpack.config.js b/src/3rd/js/plugin/matrix/webpack.config.js
index 95f9b71..f33a9d5 100644
--- a/src/3rd/js/plugin/matrix/webpack.config.js
+++ b/src/3rd/js/plugin/matrix/webpack.config.js
@@ -6,6 +6,6 @@ module.exports = {
       name: "matrix"
     },
     filename: "matrix-crdt.js",
-    path: require('path').resolve(__dirname, '../../../../../../dist')
+    path: require('path').resolve(__dirname, '.')
   }
 };
diff --git a/dist/trystero-torrent.min.js b/src/3rd/js/plugin/p2p/trystero-torrent.min.js
similarity index 100%
rename from dist/trystero-torrent.min.js
rename to src/3rd/js/plugin/p2p/trystero-torrent.min.js
