diff --git a/README.md b/README.md
index 11325954..5c402925 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Ultimate camera streaming application with support for RTSP, WebRTC, HomeKit, FF
 - creator of the project's logo [@v_novoseltsev](https://www.instagram.com/v_novoseltsev) 
 
 > [!CAUTION]
-> There is NO existing website for go2rtc project other than this GitHub repository. The website go2rtc[.]com is in no way associated with the authors of this project.
+> The official website of the project is this GitHub repository and go2rtc.org (hosted on GitHub Pages). The website go2rtc[.]com is in no way associated with the authors of this project.
 
 ---
 
@@ -1120,7 +1120,7 @@ webtorrent:
       src: rtsp-dahua1   # stream name from streams section
 ```
 
-Link example: https://alexxit.github.io/go2rtc/#share=02SNtgjKXY&pwd=wznEQqznxW&media=video+audio
+Link example: https://go2rtc.org/webtorrent/#share=02SNtgjKXY&pwd=wznEQqznxW&media=video+audio
 
 ### Module: ngrok
 
diff --git a/api/README.md b/api/README.md
index 76dc875b..03b99bc4 100644
--- a/api/README.md
+++ b/api/README.md
@@ -4,7 +4,7 @@ Fill free to make any API design proposals.
 
 ## HTTP API
 
-Interactive [OpenAPI](https://alexxit.github.io/go2rtc/api/).
+Interactive [OpenAPI](https://go2rtc.org/api/).
 
 `www/stream.html` - universal viewer with support params in URL:
 
diff --git a/website/index.html b/website/index.html
index 443c925c..e339eb44 100644
--- a/website/index.html
+++ b/website/index.html
@@ -1,189 +1,28 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>go2rtc - WebTorrent</title>
+    <meta charset="UTF-8">
+    <title>go2rtc</title>
+    <meta http-equiv="refresh" content="2; URL='https://github.com/AlexxIT/go2rtc'"/>
     <style>
-        body {
-            background-color: black;
-            margin: 0;
-            padding: 0;
-        }
-
-        html, body, video {
+        body, html {
             height: 100%;
-            width: 100%;
-        }
-
-        div {
-            position: absolute;
-            top: 50%;
-            left: 50%;
+            margin: 0;
             display: flex;
             flex-direction: column;
-            transform: translateX(-50%) translateY(-50%);
+            justify-content: center;
+            align-items: center;
+            background-color: white;
+        }
+
+        img {
+            max-width: 100%;
+            height: auto;
         }
     </style>
 </head>
 <body>
-<video id="video" autoplay controls playsinline muted></video>
-<div id="login">
-    <input id="share" type="text" placeholder="share">
-    <input id="pwd" type="text" placeholder="password">
-    <button id="connect">connect</button>
-</div>
-<script>
-    async function PeerConnection(media) {
-        const pc = new RTCPeerConnection({
-            iceServers: [{urls: 'stun:stun.l.google.com:19302'}]
-        })
-
-        const localTracks = []
-
-        if (/camera|microphone/.test(media)) {
-            const tracks = await getMediaTracks('user', {
-                video: media.indexOf('camera') >= 0,
-                audio: media.indexOf('microphone') >= 0,
-            })
-            tracks.forEach(track => {
-                pc.addTransceiver(track, {direction: 'sendonly'})
-                if (track.kind === 'video') localTracks.push(track)
-            })
-        }
-
-        if (media.indexOf('display') >= 0) {
-            const tracks = await getMediaTracks('display', {
-                video: true,
-                audio: media.indexOf('speaker') >= 0,
-            })
-            tracks.forEach(track => {
-                pc.addTransceiver(track, {direction: 'sendonly'})
-                if (track.kind === 'video') localTracks.push(track)
-            })
-        }
-
-        if (/video|audio/.test(media)) {
-            const tracks = ['video', 'audio']
-                .filter(kind => media.indexOf(kind) >= 0)
-                .map(kind => pc.addTransceiver(kind, {direction: 'recvonly'}).receiver.track)
-            localTracks.push(...tracks)
-        }
-
-        document.getElementById('video').srcObject = new MediaStream(localTracks)
-
-        return pc
-    }
-
-    async function getMediaTracks(media, constraints) {
-        try {
-            const stream = media === 'user'
-                ? await navigator.mediaDevices.getUserMedia(constraints)
-                : await navigator.mediaDevices.getDisplayMedia(constraints)
-            return stream.getTracks()
-        } catch (e) {
-            console.warn(e)
-            return []
-        }
-    }
-
-    function getOffer(pc, timeout) {
-        return new Promise((resolve, reject) => {
-            pc.addEventListener('icegatheringstatechange', () => {
-                if (pc.iceGatheringState === 'complete') resolve(pc.localDescription.sdp)
-            })
-
-            pc.createOffer().then(offer => pc.setLocalDescription(offer))
-
-            setTimeout(() => resolve(pc.localDescription.sdp), timeout || 5000)
-        })
-    }
-</script>
-<script>
-    function decode(buffer) {
-        return String.fromCharCode(...new Uint8Array(buffer))
-    }
-
-    function encode(string) {
-        return Uint8Array.from(string, c => c.charCodeAt(0))
-    }
-
-    async function cipher(share, pwd) {
-        const hash = await crypto.subtle.digest('SHA-256', encode(share))
-        const nonce = (Date.now() * 1000000).toString(36)
-
-        const ivData = await crypto.subtle.digest('SHA-256', encode(share + ':' + nonce))
-        const keyData = await crypto.subtle.digest('SHA-256', encode(nonce + ':' + pwd))
-        const key = await crypto.subtle.importKey(
-            'raw', keyData, {name: 'AES-GCM'}, false, ['encrypt', 'decrypt'],
-        )
-
-        return {
-            hash: btoa(decode(hash)),
-            nonce: nonce,
-            encrypt: async function (plaintext) {
-                const cryptotext = await crypto.subtle.encrypt(
-                    {name: 'AES-GCM', iv: ivData.slice(0, 12), additionalData: encode(nonce)},
-                    key, encode(plaintext),
-                )
-                return btoa(decode(cryptotext))
-            },
-            decrypt: async function (cryptotext) {
-                const plaintext = await crypto.subtle.decrypt(
-                    {name: 'AES-GCM', iv: ivData.slice(0, 12), additionalData: encode(nonce)},
-                    key, encode(atob(cryptotext)),
-                )
-                return decode(plaintext)
-            }
-        }
-    }
-</script>
-<script>
-    async function connect(share, pwd, media, tracker) {
-        const crypto = await cipher(share, pwd)
-        const pc = await PeerConnection(media || 'video+audio')
-        const offer = await crypto.encrypt(await getOffer(pc))
-
-        const ws = new WebSocket(tracker || 'wss://tracker.openwebtorrent.com/')
-        ws.addEventListener('open', () => {
-            ws.send(JSON.stringify({
-                action: 'announce',
-                info_hash: crypto.hash,
-                peer_id: Math.random().toString(36).substring(2),
-                offers: [{
-                    offer_id: crypto.nonce,
-                    offer: {type: 'offer', sdp: offer},
-                }],
-                numwant: 1,
-            }))
-        })
-
-        ws.addEventListener('message', async (ev) => {
-            const msg = JSON.parse(ev.data)
-            if (!msg.answer) return
-
-            const answer = await crypto.decrypt(msg.answer.sdp)
-            await pc.setRemoteDescription({type: 'answer', sdp: answer})
-
-            ws.close()
-        })
-    }
-
-    document.getElementById('connect').addEventListener('click', () => {
-        const share = document.getElementById('share').value
-        const pwd = document.getElementById('pwd').value
-        connect(share, pwd)
-        document.getElementById('login').style.display = 'none'
-    })
-
-    if (location.hash) {
-        const params = new URLSearchParams(location.hash.substring(1))
-        const share = params.get('share')
-        const pwd = params.get('pwd')
-        const media = params.get('media')
-        const tracker = params.get('tr')
-        connect(share, pwd, media, tracker)
-        document.getElementById('login').style.display = 'none'
-    }
-</script>
+<img src="https://raw.githubusercontent.com/AlexxIT/go2rtc/master/assets/logo.gif" alt="go2rtc">
+<a href="https://github.com/AlexxIT/go2rtc">github.com/AlexxIT/go2rtc</a>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/website/webtorrent/index.html b/website/webtorrent/index.html
new file mode 100644
index 00000000..6a4b9057
--- /dev/null
+++ b/website/webtorrent/index.html
@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>webtorrent - go2rtc</title>
+    <style>
+        body {
+            background-color: black;
+            margin: 0;
+            padding: 0;
+        }
+
+        html, body, video {
+            height: 100%;
+            width: 100%;
+        }
+
+        div {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            display: flex;
+            flex-direction: column;
+            transform: translateX(-50%) translateY(-50%);
+        }
+    </style>
+</head>
+<body>
+<video id="video" autoplay controls playsinline muted></video>
+<div id="login">
+    <input id="share" type="text" placeholder="share">
+    <input id="pwd" type="text" placeholder="password">
+    <button id="connect">connect</button>
+</div>
+<script>
+    async function PeerConnection(media) {
+        const pc = new RTCPeerConnection({
+            iceServers: [{urls: 'stun:stun.l.google.com:19302'}]
+        });
+
+        const localTracks = [];
+
+        if (/camera|microphone/.test(media)) {
+            const tracks = await getMediaTracks('user', {
+                video: media.indexOf('camera') >= 0,
+                audio: media.indexOf('microphone') >= 0,
+            });
+            tracks.forEach(track => {
+                pc.addTransceiver(track, {direction: 'sendonly'});
+                if (track.kind === 'video') localTracks.push(track);
+            });
+        }
+
+        if (media.indexOf('display') >= 0) {
+            const tracks = await getMediaTracks('display', {
+                video: true,
+                audio: media.indexOf('speaker') >= 0,
+            });
+            tracks.forEach(track => {
+                pc.addTransceiver(track, {direction: 'sendonly'});
+                if (track.kind === 'video') localTracks.push(track);
+            });
+        }
+
+        if (/video|audio/.test(media)) {
+            const tracks = ['video', 'audio']
+                .filter(kind => media.indexOf(kind) >= 0)
+                .map(kind => pc.addTransceiver(kind, {direction: 'recvonly'}).receiver.track);
+            localTracks.push(...tracks);
+        }
+
+        document.getElementById('video').srcObject = new MediaStream(localTracks);
+
+        return pc;
+    }
+
+    async function getMediaTracks(media, constraints) {
+        try {
+            const stream = media === 'user'
+                ? await navigator.mediaDevices.getUserMedia(constraints)
+                : await navigator.mediaDevices.getDisplayMedia(constraints);
+            return stream.getTracks();
+        } catch (e) {
+            console.warn(e);
+            return [];
+        }
+    }
+
+    function getOffer(pc, timeout) {
+        return new Promise((resolve, reject) => {
+            pc.addEventListener('icegatheringstatechange', () => {
+                if (pc.iceGatheringState === 'complete') resolve(pc.localDescription.sdp);
+            });
+
+            pc.createOffer().then(offer => pc.setLocalDescription(offer));
+
+            setTimeout(() => resolve(pc.localDescription.sdp), timeout || 5000);
+        });
+    }
+</script>
+<script>
+    function decode(buffer) {
+        return String.fromCharCode(...new Uint8Array(buffer));
+    }
+
+    function encode(string) {
+        return Uint8Array.from(string, c => c.charCodeAt(0));
+    }
+
+    async function cipher(share, pwd) {
+        const hash = await crypto.subtle.digest('SHA-256', encode(share));
+        const nonce = (Date.now() * 1000000).toString(36);
+
+        const ivData = await crypto.subtle.digest('SHA-256', encode(share + ':' + nonce));
+        const keyData = await crypto.subtle.digest('SHA-256', encode(nonce + ':' + pwd));
+        const key = await crypto.subtle.importKey(
+            'raw', keyData, {name: 'AES-GCM'}, false, ['encrypt', 'decrypt'],
+        );
+
+        return {
+            hash: btoa(decode(hash)),
+            nonce: nonce,
+            encrypt: async function (plaintext) {
+                const cryptotext = await crypto.subtle.encrypt(
+                    {name: 'AES-GCM', iv: ivData.slice(0, 12), additionalData: encode(nonce)},
+                    key, encode(plaintext),
+                );
+                return btoa(decode(cryptotext));
+            },
+            decrypt: async function (cryptotext) {
+                const plaintext = await crypto.subtle.decrypt(
+                    {name: 'AES-GCM', iv: ivData.slice(0, 12), additionalData: encode(nonce)},
+                    key, encode(atob(cryptotext)),
+                );
+                return decode(plaintext);
+            }
+        };
+    }
+</script>
+<script>
+    async function connect(share, pwd, media, tracker) {
+        const crypto = await cipher(share, pwd);
+        const pc = await PeerConnection(media || 'video+audio');
+        const offer = await crypto.encrypt(await getOffer(pc));
+
+        const ws = new WebSocket(tracker || 'wss://tracker.openwebtorrent.com/');
+        ws.addEventListener('open', () => {
+            ws.send(JSON.stringify({
+                action: 'announce',
+                info_hash: crypto.hash,
+                peer_id: Math.random().toString(36).substring(2),
+                offers: [{
+                    offer_id: crypto.nonce,
+                    offer: {type: 'offer', sdp: offer},
+                }],
+                numwant: 1,
+            }));
+        });
+
+        ws.addEventListener('message', async (ev) => {
+            const msg = JSON.parse(ev.data);
+            if (!msg.answer) return;
+
+            const answer = await crypto.decrypt(msg.answer.sdp);
+            await pc.setRemoteDescription({type: 'answer', sdp: answer});
+
+            ws.close();
+        });
+    }
+
+    document.getElementById('connect').addEventListener('click', () => {
+        const share = document.getElementById('share').value;
+        const pwd = document.getElementById('pwd').value;
+        connect(share, pwd);
+        document.getElementById('login').style.display = 'none';
+    });
+
+    if (location.hash) {
+        const params = new URLSearchParams(location.hash.substring(1));
+        const share = params.get('share');
+        const pwd = params.get('pwd');
+        const media = params.get('media');
+        const tracker = params.get('tr');
+        connect(share, pwd, media, tracker);
+        document.getElementById('login').style.display = 'none';
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/www/README.md b/www/README.md
index 4da49485..e4d36cd2 100644
--- a/www/README.md
+++ b/www/README.md
@@ -81,11 +81,11 @@ https://webrtc.org/getting-started/unified-plan-transition-guide?hl=en
 
 ```html
     <!-- iOS Safari -->
-    <link rel="apple-touch-icon" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon-180x180.png" sizes="180x180">
+    <link rel="apple-touch-icon" href="https://go2rtc.org/icons/apple-touch-icon-180x180.png" sizes="180x180">
     <!-- Classic, desktop browsers -->
-    <link rel="icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
+    <link rel="icon" href="https://go2rtc.org/icons/favicon.ico">
     <!-- Android Chrome -->
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/manifest.json">
+    <link rel="manifest" href="https://go2rtc.org/manifest.json">
 ```
 
 ## Useful links
diff --git a/www/links.html b/www/links.html
index f2b35c22..466d30a5 100644
--- a/www/links.html
+++ b/www/links.html
@@ -186,7 +186,7 @@ Telegram: rtmps://xxx-x.rtmp.t.me/s/xxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxx</pre>
             document.getElementById('local').href = `webrtc.html?${direction}=${src}&media=${media}`;
 
             const share = document.getElementById('shareget');
-            share.href = `https://alexxit.github.io/go2rtc/#${share.dataset.auth}&media=${media}`;
+            share.href = `https://go2rtc.org/webtorrent/#${share.dataset.auth}&media=${media}`;
         }
 
         function share(method) {
