diff --git a/server/imserver_new/export.go b/server/imserver_new/export.go
deleted file mode 100644
index b9675e44..00000000
--- a/server/imserver_new/export.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package main
-
-var handlerMgr = new(HandlerMgr)
diff --git a/server/imserver_new/handlermgr.go b/server/imserver_new/listener/handlermgr.go
similarity index 99%
rename from server/imserver_new/handlermgr.go
rename to server/imserver_new/listener/handlermgr.go
index 5f641ad8..b7845a59 100644
--- a/server/imserver_new/handlermgr.go
+++ b/server/imserver_new/listener/handlermgr.go
@@ -1,4 +1,4 @@
-package main
+package listener
 
 import (
 	"cs"