--- a/src/CMakeLists.txt	Thu May 28 00:35:02 2009 +0300
+++ b/src/CMakeLists.txt	Thu May 28 01:17:36 2009 +0300
@@ -14,13 +14,13 @@
 
 # define our source code modules
 set (LIB_SOURCES lib/error.c lib/log.c lib/str.c lib/object.c)
-set (IO_SOURCES transport.c service.c transport_fd.c sock.c resolve.c tcp.c tcp_transport.c tcp_client.c tcp_server.c ssl.c ssl_client.c fifo.c)
-set (PROTO_SOURCES line_proto.c msg_proto.c)
+set (IO_SOURCES lib/transport.c lib/service.c lib/transport_fd.c lib/sock.c lib/resolve.c lib/tcp.c lib/tcp_transport.c lib/tcp_client.c lib/tcp_server.c lib/ssl.c lib/ssl_client.c lib/fifo.c)
+set (PROTO_SOURCES lib/line_proto.c lib/msg_proto.c)
 set (IRC_SOURCES irc_line.c irc_conn.c irc_net.c irc_chan.c chain.c irc_cmd.c irc_proto.c irc_client.c irc_user.c irc_queue.c irc_net_connect.c)
-set (LUA_SOURCES nexus_lua.c lua_objs.c lua_config.c lua_irc.c lua_func.c lua_type.c lua_thread.c)
-set (CONSOLE_SOURCES console.c lua_console.c)
+set (LUA_SOURCES spbot/lua_objs.c spbot/lua_config.c lua_irc.c lib/lua_func.c lib/lua_type.c spbot/lua_thread.c)
+set (CONSOLE_SOURCES lib/console.c spbot/lua_console.c)
 
-set (SPBOT_SOURCES spbot/nexus.c spbot/signals.c spbot/module.c spbot/config.c)
+set (SPBOT_SOURCES spbot/nexus.c spbot/signals.c spbot/module.c spbot/config.c spbot/nexus_lua.c)
 
 set (NEXUS_SOURCES ${SPBOT_SOURCES} ${LIB_SOURCES} ${IO_SOURCES} ${PROTO_SOURCES} ${IRC_SOURCES} ${LUA_SOURCES} ${CONSOLE_SOURCES})
 set (IRC_LOG_SOURCES modules/irc_log.c)
@@ -61,7 +61,7 @@
 if (ENABLE_TEST)
     # build list of source files
     file (GLOB _TEST_SOURCES "test/*.c")
-    set (TEST_SOURCES ${_TEST_SOURCES} ${CORE_SOURCES} ${IO_SOURCES} ${PROTO_SOURCES} transport_test.c ${IRC_SOURCES})
+    set (TEST_SOURCES ${_TEST_SOURCES} ${CORE_SOURCES} ${IO_SOURCES} ${PROTO_SOURCES} lib/transport_test.c ${IRC_SOURCES})
     
     # add executable target and link against libs
     add_executable (test_harness EXCLUDE_FROM_ALL ${TEST_SOURCES})