diff --git a/monitor_quassel.go b/monitor_quassel.go
index 2b528fdce77b7c03d6a06d861574758f6b6a6c00..8764b23883a02130fdfd975e71d0bdc77998606a 100644
--- a/monitor_quassel.go
+++ b/monitor_quassel.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"git.kuschku.de/justjanne/cachet-monitor/quassel"
 	"github.com/sirupsen/logrus"
 	"time"
 )
@@ -22,8 +21,8 @@ func (m *QuasselMonitor) Config() *ConfigComponent {
 
 func (m *QuasselMonitor) Measure() (Datapoint, error) {
 	before := time.Now()
-	conn := quassel.Connect(quassel.ConnectOptions{
-		ConnectionOptions: quassel.ConnectionOptions{
+	conn := Connect(ConnectOptions{
+		ConnectionOptions: ConnectionOptions{
 			Address: m.config.Quassel.Hostname,
 			Port:    m.config.Quassel.Port,
 			Timeout: time.Duration(m.config.LatencyThresholds.Down) * time.Millisecond,
diff --git a/quassel/connection.go b/quassel_connection.go
similarity index 99%
rename from quassel/connection.go
rename to quassel_connection.go
index f73c4b4f1db0bdd41a7ad936782739088f1a0793..9f9ffa3ec26bc331b1aeafc7ef4217b24e0903e6 100644
--- a/quassel/connection.go
+++ b/quassel_connection.go
@@ -1,4 +1,4 @@
-package quassel
+package main
 
 import (
 	"bufio"
diff --git a/quassel/quassel.go b/quassel_protocol.go
similarity index 98%
rename from quassel/quassel.go
rename to quassel_protocol.go
index d6f0f5cf83aa5f6614ca907d0e71988aaacea9f0..c8851b55b2dc9e028261182c0b1a76360e49c1e6 100644
--- a/quassel/quassel.go
+++ b/quassel_protocol.go
@@ -1,4 +1,4 @@
-package quassel
+package main
 
 import (
 	"encoding/binary"