Prepare server to incoming split

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"

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

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:

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
 

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