diff --git a/bot.py b/bot.py
index 47363de..e87cd1a 100644
--- a/bot.py
+++ b/bot.py
@@ -27,8 +27,8 @@ import consumer
 import event
 import hooks
 from networkbot import NetworkBot
-from IRCServer import IRCServer
-from DCC import DCC
+from server.IRC import IRCServer
+from server.DCC import DCC
 import response
 
 ID_letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
diff --git a/consumer.py b/consumer.py
index d2df9fb..009eebf 100644
--- a/consumer.py
+++ b/consumer.py
@@ -23,7 +23,7 @@ import traceback
 import sys
 
 import bot
-from DCC import DCC
+from server.DCC import DCC
 from message import Message
 import response
 import server
diff --git a/nemuspeak.py b/nemuspeak.py
index e1d2a9e..48d338f 100755
--- a/nemuspeak.py
+++ b/nemuspeak.py
@@ -27,7 +27,7 @@ else:
 
 import xmlparser as msf
 import message
-import IRCServer
+from server.IRC import IRCServer
 
 SMILEY = list()
 CORRECTIONS = list()
@@ -111,7 +111,7 @@ def speak(endstate):
         talkEC = 1
 
 
-class Server(IRCServer.IRCServer):
+class Server(IRCServer):
     def treat_msg(self, line, private = False):
         global stopSpk, talkEC, g_queue
         try:
diff --git a/networkbot.py b/networkbot.py
index 756ab3c..37814e8 100644
--- a/networkbot.py
+++ b/networkbot.py
@@ -22,7 +22,7 @@ import shlex
 import urllib.parse
 import zlib
 
-from DCC import DCC
+from server.DCC import DCC
 import hooks
 from response import Response
 
diff --git a/DCC.py b/server/DCC.py
similarity index 100%
rename from DCC.py
rename to server/DCC.py
diff --git a/IRCServer.py b/server/IRC.py
similarity index 99%
rename from IRCServer.py
rename to server/IRC.py
index c208b44..6cec073 100644
--- a/IRCServer.py
+++ b/server/IRC.py
@@ -24,7 +24,7 @@ import threading
 import traceback
 
 from channel import Channel
-from DCC import DCC
+from server.DCC import DCC
 from hooks import Hook
 import message
 import server
diff --git a/server.py b/server/__init__.py
similarity index 100%
rename from server.py
rename to server/__init__.py