diff --git a/Dockerfile b/Dockerfile
index 200d60b8..66f4aa9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 From golang:1.12
 
-RUN mkdir -p /go/src/github.com/giongto35/game-online
-COPY . /go/src/github.com/giongto35/game-online/
-WORKDIR /go/src/github.com/giongto35/game-online
+RUN mkdir -p /go/src/github.com/giongto35/cloud-game
+COPY . /go/src/github.com/giongto35/cloud-game/
+WORKDIR /go/src/github.com/giongto35/cloud-game
 
 # Install server dependencies
 RUN apt-get update
@@ -11,6 +11,7 @@ RUN apt-get install libvpx-dev -y
 RUN go get github.com/pions/webrtc
 #RUN go get github.com/gordonklaus/portaudio
 RUN go get github.com/gorilla/mux
-RUN go install github.com/giongto35/game-online
+RUN go get github.com/gorilla/websocket
+RUN go install github.com/giongto35/cloud-game
 
 EXPOSE 8000
diff --git a/games/1200-in-1.nes b/games/1200-in-1.nes
deleted file mode 100644
index d660c97c..00000000
Binary files a/games/1200-in-1.nes and /dev/null differ
diff --git a/games/Mega Man.nes b/games/Mega Man.nes
deleted file mode 100644
index 0669d5f4..00000000
Binary files a/games/Mega Man.nes and /dev/null differ
diff --git a/games/Mike Tyson.nes b/games/Mike Tyson.nes
deleted file mode 100644
index 658ba89a..00000000
Binary files a/games/Mike Tyson.nes and /dev/null differ
diff --git a/index.html b/index.html
index fa7d4806..e7aaa38b 100644
--- a/index.html
+++ b/index.html
@@ -11,9 +11,7 @@ textarea {
     <option value="Contra.nes">Contra.nes</option>
     <option value="Kirby's Adventure.nes">Kirby's Adventure.nes</option>
     <option value="Mega Man 2.nes">Mega Man 2.nes</option>
-    <option value="Mega Man.nes">Mega Man.nes</option>
     <option value="Metal Gear.nes">Metal Gear.nes</option>
-    <option value="Mike Tyson.nes">Mike Tyson.nes</option>
     <option value="Mortal Kombat 4.nes">Mortal Kombat 4.nes</option>
     <option value="Super Mario Bros 2.nes">Super Mario Bros 2.nes</option>
     <option value="Super Mario Bros 3.nes">Super Mario Bros 3.nes</option>
@@ -26,9 +24,11 @@ textarea {
 <!--button id="playGame" onclick="window.startSession()" disabled>Play Mario</button-->
 <button id="play" onclick="window.startGame()">Play</button>
 
-<br/>
+<br/><br/>
 
 <div id="remoteVideos" ></div> <br />
+
+<h3>Instruction</h3>
 <div>
   Use Up, Down, Left, Right to Move <br />
   Z to jump (A) <br />
@@ -37,13 +37,13 @@ textarea {
   V is select button <br />
 
   Fullscreen media for better gaming experience<br />
-</div>
+</div><br>
 
-
-<div id="div"></div>
+<h3>Log:</h3>
+<pre id="div"></pre>
 
 <div>
-  Refresh to retry
+  <u><i>Refresh to retry</i></u>
 </div>
 <script>
 
@@ -93,6 +93,16 @@ function postSession(session) {
 // web socket
 
 window.startGame = () => {
+  // clear
+  endInput();
+  document.getElementById('div').innerHTML = "";
+  aa = document.getElementsByTagName("video");
+  for (i = 0; i < aa.length ; ++i) {
+    aa[i].remove();
+  }
+  // end clear
+
+
   conn = new WebSocket(`ws://${location.host}/ws`);
 
   conn.onopen = () => {
@@ -122,29 +132,73 @@ window.startGame = () => {
         break;
     }
   }
+
+  // webrtc
+  pc = new RTCPeerConnection({iceServers: [{urls: 'stun:stun.l.google.com:19302'}]})
+  // input channel
+  inputChannel = pc.createDataChannel('foo')
+  inputChannel.onclose = () => {
+    log('inputChannel has closed');
+  }
+
+  inputChannel.onopen = () => {
+    log('inputChannel has opened');
+  }
+
+  inputChannel.onmessage = e => {
+    log(`Message from DataChannel '${inputChannel.label}' payload '${e.data}'`);
+  }
+
+
+  pc.oniceconnectionstatechange = e => {
+    log(`iceConnectionState: ${pc.iceConnectionState}`);
+
+    if (pc.iceConnectionState === "connected") {
+      conn.send(JSON.stringify({"id": "start", "data": ""}));
+      startInput();
+    }
+    else if (pc.iceConnectionState === "disconnected") {
+    // else { // not sure about this =]
+      endInput();
+    }
+
+  }
+
+
+  // stream channel
+  pc.ontrack = function (event) {
+    var el = document.createElement(event.track.kind)
+    el.srcObject = event.streams[0]
+    el.autoplay = true
+    el.controls = true
+
+    document.getElementById('remoteVideos').appendChild(el)
+  }
+
+
+
+  // candidate packet from STUN
+  pc.onicecandidate = event => {
+    if (event.candidate === null) {
+      // var session = btoa(JSON.stringify(pc.localDescription));
+      // localSessionDescription = session;
+      // postSession(session)
+    } else {
+      console.log(JSON.stringify(event.candidate));
+      // conn.send(JSON.stringify({"id": "candidate", "data": JSON.stringify(event.candidate)}));
+    }
+  }
+
 }
 
 // webrtc
-let pc = new RTCPeerConnection({iceServers: [{urls: 'stun:stun.l.google.com:19302'}]})
-
-var localSessionDescription = ""
-var remoteSessionDescription = ""
+var pc, inputChannel;
+var localSessionDescription = "";
+var remoteSessionDescription = "";
 var conn;
 
 
-// input channel
-let inputChannel = pc.createDataChannel('foo')
-inputChannel.onclose = () => {
-  log('inputChannel has closed');
-}
 
-inputChannel.onopen = () => {
-  log('inputChannel has opened');
-}
-
-inputChannel.onmessage = e => {
-  log(`Message from DataChannel '${inputChannel.label}' payload '${e.data}'`);
-}
 
 
 // Input handler
@@ -197,6 +251,7 @@ document.body.onkeyup = function(e){
 };
 
 var timer = null;
+
 function sendInput() {
   // prepare key
   /*
@@ -239,45 +294,6 @@ function endInput() {
   timer = null;
 }
 
-pc.oniceconnectionstatechange = e => {
-  log(`iceConnectionState: ${pc.iceConnectionState}`);
-
-  if (pc.iceConnectionState === "connected") {
-    conn.send(JSON.stringify({"id": "start", "data": ""}));
-    startInput();
-  }
-  else if (pc.iceConnectionState === "disconnected") {
-  // else { // not sure about this =]
-    endInput();
-  }
-
-}
-
-
-// stream channel
-pc.ontrack = function (event) {
-  var el = document.createElement(event.track.kind)
-  el.srcObject = event.streams[0]
-  el.autoplay = true
-  el.controls = true
-
-  document.getElementById('remoteVideos').appendChild(el)
-}
-
-
-
-// candidate packet from STUN
-pc.onicecandidate = event => {
-  if (event.candidate === null) {
-    // var session = btoa(JSON.stringify(pc.localDescription));
-    // localSessionDescription = session;
-    // postSession(session)
-  } else {
-    console.log(JSON.stringify(event.candidate));
-    // conn.send(JSON.stringify({"id": "candidate", "data": JSON.stringify(event.candidate)}));
-  }
-}
-
 
 function startWebRTC() {
   // create SDP
diff --git a/main.go b/main.go
index c91f2b77..61193c49 100644
--- a/main.go
+++ b/main.go
@@ -10,9 +10,9 @@ import (
 
 	"time"
 
-	"github.com/giongto35/game-online/ui"
-	"github.com/giongto35/game-online/util"
-	"github.com/giongto35/game-online/webrtc"
+	"github.com/giongto35/cloud-game/ui"
+	"github.com/giongto35/cloud-game/util"
+	"github.com/giongto35/cloud-game/webrtc"
 
 	// "github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
diff --git a/ui/director.go b/ui/director.go
index 30be463b..bed29af5 100644
--- a/ui/director.go
+++ b/ui/director.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/giongto35/game-online/nes"
-	"github.com/giongto35/game-online/webrtc"
+	"github.com/giongto35/cloud-game/nes"
+	"github.com/giongto35/cloud-game/webrtc"
 )
 
 type View interface {
diff --git a/ui/gameview.go b/ui/gameview.go
index 41540296..28eee480 100644
--- a/ui/gameview.go
+++ b/ui/gameview.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/giongto35/game-online/nes"
+	"github.com/giongto35/cloud-game/nes"
 )
 
 const padding = 0
diff --git a/ui/run.go b/ui/run.go
index 65ea1b9f..49d9975b 100644
--- a/ui/run.go
+++ b/ui/run.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 
 	// "github.com/gordonklaus/portaudio"
-	"github.com/giongto35/game-online/webrtc"
+	"github.com/giongto35/cloud-game/webrtc"
 )
 
 const (
diff --git a/ui/util.go b/ui/util.go
index f9fca8b8..7bfb6852 100644
--- a/ui/util.go
+++ b/ui/util.go
@@ -15,7 +15,7 @@ import (
 	"os/user"
 	"path"
 
-	"github.com/giongto35/game-online/nes"
+	"github.com/giongto35/cloud-game/nes"
 )
 
 var homeDir string
diff --git a/webrtc/webrtc.go b/webrtc/webrtc.go
index 1a717ffe..100d2521 100644
--- a/webrtc/webrtc.go
+++ b/webrtc/webrtc.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"time"
 
-	vpxEncoder "github.com/giongto35/game-online/vpx-encoder"
+	vpxEncoder "github.com/giongto35/cloud-game/vpx-encoder"
 	"github.com/pions/webrtc"
 	"github.com/pions/webrtc/pkg/media"
 )