git-svn-id: https://ssl.buetow.org/repos/hsbot/trunk@50 9f8f72e9-4bf4-416e-b76e-7d4203597157

8 files changed, 21 insertions, 21 deletions

diff --git a/HsBot/Start.hs b/HsBot/Base.hs
index 97466d8..a349fad 100644
--- a/HsBot/Start.hs
+++ b/HsBot/Base.hs
@@ -1,17 +1,17 @@
-module HsBot.Start (start) where
+module HsBot.Base (startBase) where
 
 import System
 
-import HsBot.Cmd
-import HsBot.Conf
-import HsBot.Env
+import HsBot.Base.Cmd
+import HsBot.Base.Conf
+import HsBot.Base.Env
+import HsBot.Base.State
+import HsBot.General.Tools
 import HsBot.IRC
 import HsBot.Logics
-import HsBot.State
-import HsBot.General.Tools
 
-start :: IO ()	
-start = do
+startBase :: IO ()	
+startBase = do
    let conf = makeConf
    databaseFile <- get "databaseFile" conf
    let state = stateLoad databaseFile
diff --git a/HsBot/Cmd.hs b/HsBot/Base/Cmd.hs
index 7de643e..c4963ac 100644
--- a/HsBot/Cmd.hs
+++ b/HsBot/Base/Cmd.hs
@@ -1,6 +1,6 @@
-module HsBot.Cmd where
+module HsBot.Base.Cmd where
 
-import HsBot.State
+import HsBot.Base.State
 
 data Cmd = Cmd String String (State -> IO ()) 
 
diff --git a/HsBot/Conf.hs b/HsBot/Base/Conf.hs
index 2faed0b..54749ba 100644
--- a/HsBot/Conf.hs
+++ b/HsBot/Base/Conf.hs
@@ -1,4 +1,4 @@
-module HsBot.Conf where
+module HsBot.Base.Conf where
 
 import qualified Data.Map as M
 
diff --git a/HsBot/Env.hs b/HsBot/Base/Env.hs
index e8f6092..58b2347 100644
--- a/HsBot/Env.hs
+++ b/HsBot/Base/Env.hs
@@ -1,7 +1,7 @@
-module HsBot.Env where
+module HsBot.Base.Env where
 
-import HsBot.Conf
-import HsBot.State
+import HsBot.Base.Conf
+import HsBot.Base.State
 
 type Dispatch = String -> (String -> IO ()) -> Env -> IO Env
 data Env = DispatchEnv State Conf Dispatch | Env State Conf
diff --git a/HsBot/State.hs b/HsBot/Base/State.hs
index 9d1fa87..abcf479 100644
--- a/HsBot/State.hs
+++ b/HsBot/Base/State.hs
@@ -1,4 +1,4 @@
-module HsBot.State where
+module HsBot.Base.State where
 
 import qualified Data.Map as M
 
diff --git a/HsBot/IRC.hs b/HsBot/IRC.hs
index 7efb732..cf1a1e8 100644
--- a/HsBot/IRC.hs
+++ b/HsBot/IRC.hs
@@ -7,9 +7,9 @@ import System
 import System.IO
 import Text.Printf
 
-import HsBot.Conf
-import HsBot.Env
-import HsBot.State
+import HsBot.Base.Conf
+import HsBot.Base.Env
+import HsBot.Base.State
 import HsBot.General.Tools
 import HsBot.IRC.User
 
diff --git a/HsBot/Logics.hs b/HsBot/Logics.hs
index 01eda7c..d27c96f 100644
--- a/HsBot/Logics.hs
+++ b/HsBot/Logics.hs
@@ -1,6 +1,6 @@
 module HsBot.Logics (logicsRun) where
 
-import HsBot.Env
+import HsBot.Base.Env
 
 logicsRun :: String -> Env -> IO Env
 logicsRun str env = return (env)
diff --git a/Main.hs b/Main.hs
index 87d765a..36b22f7 100644
--- a/Main.hs
+++ b/Main.hs
@@ -1,9 +1,9 @@
 module Main where
 
-import HsBot.Start
+import HsBot.Base
 
 main :: IO ()	
-main = start
+main = startBase
 
 -- Shortcut
 r :: IO ()