diff --git a/irc.go b/irc.go
deleted file mode 100644
index 00e3ba7..0000000
--- a/irc.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// vi:ts=4:sts=4:sw=4:noet:tw=72
-//
-// flokati
-//
-// Copyright (c) 2015,2016 Andreas Neue <an@dnix.de>
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"strings"
-	"time"
-
-	"git.dnix.de/an/flokati/modules"
-	"git.dnix.de/an/xlog"
-	"github.com/nickvanw/ircx"
-	"github.com/sorcix/irc"
-	"github.com/sorcix/irc/ctcp"
-)
-
-var (
-	nsname  = flag.String("nsname", "NickServ", "NickServ name")
-	nspass  = flag.String("nspass", "", "NickServ password")
-	params  = flag.String("params", "", "Module params")
-	autocmd = flag.String("autocmd", "", "Autosend IRC command")
-)
-
-func Irc() {
-	//bot := ircx.Classic(*server, *name)
-	cfg := ircx.Config{User: *name, MaxRetries: 1000}
-	bot := ircx.New(*server, *name, cfg)
-	if err := bot.Connect(); err != nil {
-		xlog.Fatal("Unable to dial IRC Server: %v", err)
-	}
-
-	modules.ModParams["_nick"] = *name
-
-	go func() {
-		for {
-			var targets string
-			line := strings.Split(<-sayCh, "\n")
-			if len(line) < 2 {
-				continue
-			}
-			if line[0] != "*" {
-				targets = line[0]
-			} else {
-				targets = *channels
-			}
-			for _, tar := range strings.Split(targets, ",") {
-				bot.Sender.Send(&irc.Message{
-					Command:  irc.PRIVMSG,
-					Params:   []string{tar},
-					Trailing: line[1],
-				})
-				time.Sleep(1 * time.Second)
-			}
-		}
-	}()
-
-	go Ping(bot)
-	if *autocmd != "" {
-		println(*autocmd)
-		bot.Sender.Send(&irc.Message{Command: *autocmd})
-	}
-	RegisterHandlers(bot)
-	bot.HandleLoop()
-	xlog.Info("Exiting")
-}
-
-func RegisterHandlers(bot *ircx.Bot) {
-	xlog.Info("Registering handlers")
-	bot.HandleFunc(irc.RPL_WELCOME, ConnectHandler)
-	bot.HandleFunc(irc.PING, PingHandler)
-	bot.HandleFunc(irc.PRIVMSG, PrivmsgHandler)
-}
-
-func Ping(bot *ircx.Bot) {
-	for {
-		time.Sleep(1 * time.Minute)
-		bot.Sender.Send(&irc.Message{Command: irc.PING})
-	}
-}
-
-func ConnectHandler(s ircx.Sender, m *irc.Message) {
-	if *nspass != "" {
-		xlog.Info("Authenticating with NickServ: %v, %v", *name, *nspass)
-		s.Send(&irc.Message{
-			Command:  irc.PRIVMSG,
-			Params:   []string{*nsname},
-			Trailing: "IDENTIFY " + *name + " " + *nspass,
-		})
-	}
-	xlog.Info("Joining channels: %v", *channels)
-	for _, ch := range strings.Split(*channels, ",") {
-		s.Send(&irc.Message{
-			Command: irc.JOIN,
-			Params:  []string{ch},
-		})
-	}
-	time.Sleep(2 * time.Second)
-	msg := ctcp.Action(fmt.Sprintf("running on %s", SoftwareInfo()))
-	sayCh <- fmt.Sprintf("%s\n%s", "*", msg)
-}
-
-func PingHandler(s ircx.Sender, m *irc.Message) {
-	xlog.Info("PingPong")
-	s.Send(&irc.Message{
-		Command:  irc.PONG,
-		Params:   m.Params,
-		Trailing: m.Trailing,
-	})
-}
-
-func PrivmsgHandler(s ircx.Sender, m *irc.Message) {
-	//TODO: implement message handler table
-	HandleMessage(m)
-	modules.HandleMessage(m)
-}
-
-func HandleMessage(m *irc.Message) {
-	tok := strings.Split(m.Trailing, " ")
-	if len(tok) < 1 {
-		return
-	}
-	switch tok[0] {
-	case "!version":
-		msg := ctcp.Action(fmt.Sprintf("running on %s", SoftwareInfo()))
-		sayCh <- fmt.Sprintf("%s\n%s", "*", msg)
-		//sayCh <- fmt.Sprintf("%s\n%s", "*", SoftwareInfo())
-	default:
-	}
-}
diff --git a/matrix.go b/matrix.go
index 564f16d..5357921 100644
--- a/matrix.go
+++ b/matrix.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"git.dnix.de/an/flokati/modules"
+	modules "git.dnix.de/an/flokati/modules"
 	"git.dnix.de/an/xlog"
 	"github.com/matrix-org/gomatrix"
 )