diff --git a/wscript b/wscript
index c8f63ad..2c0f727 100644
--- a/wscript
+++ b/wscript
@@ -17,6 +17,8 @@
 def configure(conf):
     conf.load("compiler_cxx")
 
+    conf.define ("CHRONOSHARE_VERSION", VERSION)
+
     conf.check_cfg(package='sqlite3', args=['--cflags', '--libs'], uselib_store='SQLITE3', mandatory=True)
 
     if not conf.check_cfg(package='openssl', args=['--cflags', '--libs'], uselib_store='SSL', mandatory=False):
@@ -79,14 +81,34 @@
           includes = ['include', ],
           )
 
-    chronoshare = bld (
-        target="tmp",
+    common = bld.objects (
+        target = "common",
+        features = ["cxx"],
+        source = bld.path.ant_glob(
+            'src/chronoshare-client.ice'
+            ),
+        use = 'BOOST',
+        includes = ['include', 'src'],
+        )
+
+
+    client = bld (
+        target="cs-client",
+        features=['cxx', 'cxxprogram'],
+        source = ['client/client.cc', 
+                  ],
+        use = "BOOST CCNX SSL ICE common",
+        includes = ['include', 'src'],
+        )
+
+    daemon = bld (
+        target="cs-daemon",
         features=['cxx', 'cxxprogram'],
         # source = bld.path.ant_glob(['src/**/*.cc']),
-        source = ['src/main.cc', 
+        source = ['daemon/daemon.cc', 
                   'src/db-helper.cc',
                   'src/hash-string-converter.cc',
-                  'src/chronoshare-client.ice'],
-        use = 'BOOST BOOST_IOSTREAMS BOOST_REGEX CCNX SSL SQLITE3',
+                  ],
+        use = "BOOST CCNX SSL SQLITE3 ICE common",
         includes = ['include', 'src'],
         )