diff --git a/socketserver/cmd/ffzsocketserver/console.go b/socketserver/cmd/ffzsocketserver/console.go
index 7da8e6fa..25b0921f 100644
--- a/socketserver/cmd/ffzsocketserver/console.go
+++ b/socketserver/cmd/ffzsocketserver/console.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"bitbucket.org/stendec/frankerfacez/socketserver/internal/server"
+	"bitbucket.org/stendec/frankerfacez/socketserver/server"
 	"fmt"
 	"github.com/abiosoft/ishell"
 	"github.com/gorilla/websocket"
diff --git a/socketserver/cmd/ffzsocketserver/socketserver.go b/socketserver/cmd/ffzsocketserver/socketserver.go
index 67f982c5..2e80e1cb 100644
--- a/socketserver/cmd/ffzsocketserver/socketserver.go
+++ b/socketserver/cmd/ffzsocketserver/socketserver.go
@@ -1,7 +1,7 @@
 package main // import "bitbucket.org/stendec/frankerfacez/socketserver/cmd/ffzsocketserver"
 
 import (
-	"bitbucket.org/stendec/frankerfacez/socketserver/internal/server"
+	"bitbucket.org/stendec/frankerfacez/socketserver/server"
 	"encoding/json"
 	"flag"
 	"fmt"
diff --git a/socketserver/internal/server/backend.go b/socketserver/server/backend.go
similarity index 100%
rename from socketserver/internal/server/backend.go
rename to socketserver/server/backend.go
diff --git a/socketserver/internal/server/backend_test.go b/socketserver/server/backend_test.go
similarity index 100%
rename from socketserver/internal/server/backend_test.go
rename to socketserver/server/backend_test.go
diff --git a/socketserver/internal/server/commands.go b/socketserver/server/commands.go
similarity index 100%
rename from socketserver/internal/server/commands.go
rename to socketserver/server/commands.go
diff --git a/socketserver/internal/server/handlecore.go b/socketserver/server/handlecore.go
similarity index 99%
rename from socketserver/internal/server/handlecore.go
rename to socketserver/server/handlecore.go
index 4548f682..fd3c8c6f 100644
--- a/socketserver/internal/server/handlecore.go
+++ b/socketserver/server/handlecore.go
@@ -1,4 +1,4 @@
-package server // import "bitbucket.org/stendec/frankerfacez/socketserver/internal/server"
+package server // import "bitbucket.org/stendec/frankerfacez/socketserver/server"
 
 import (
 	"encoding/json"
@@ -220,14 +220,13 @@ func RunSocketConnection(conn *websocket.Conn) {
 			}
 		}
 
-		_, isClose := err.(*websocket.CloseError)
 		select {
 		case errorChan <- err:
 		case <-stoppedChan:
 		}
 		close(errorChan)
 		close(clientChan)
-		// exit
+		// exit goroutine
 	}(_errorChan, _clientChan, stoppedChan)
 
 	conn.SetPongHandler(func(pongBody string) error {
diff --git a/socketserver/internal/server/handlecore_test.go b/socketserver/server/handlecore_test.go
similarity index 100%
rename from socketserver/internal/server/handlecore_test.go
rename to socketserver/server/handlecore_test.go
diff --git a/socketserver/internal/server/irc.go b/socketserver/server/irc.go
similarity index 100%
rename from socketserver/internal/server/irc.go
rename to socketserver/server/irc.go
diff --git a/socketserver/internal/server/publisher.go b/socketserver/server/publisher.go
similarity index 100%
rename from socketserver/internal/server/publisher.go
rename to socketserver/server/publisher.go
diff --git a/socketserver/internal/server/publisher_test.go b/socketserver/server/publisher_test.go
similarity index 100%
rename from socketserver/internal/server/publisher_test.go
rename to socketserver/server/publisher_test.go
diff --git a/socketserver/internal/server/stats.go b/socketserver/server/stats.go
similarity index 100%
rename from socketserver/internal/server/stats.go
rename to socketserver/server/stats.go
diff --git a/socketserver/internal/server/subscriptions.go b/socketserver/server/subscriptions.go
similarity index 100%
rename from socketserver/internal/server/subscriptions.go
rename to socketserver/server/subscriptions.go
diff --git a/socketserver/internal/server/subscriptions_test.go b/socketserver/server/subscriptions_test.go
similarity index 100%
rename from socketserver/internal/server/subscriptions_test.go
rename to socketserver/server/subscriptions_test.go
diff --git a/socketserver/internal/server/types.go b/socketserver/server/types.go
similarity index 100%
rename from socketserver/internal/server/types.go
rename to socketserver/server/types.go
diff --git a/socketserver/internal/server/utils.go b/socketserver/server/utils.go
similarity index 100%
rename from socketserver/internal/server/utils.go
rename to socketserver/server/utils.go