diff --git a/src/ccnx-closure.cpp b/ccnx/ccnx-closure.cpp
similarity index 100%
rename from src/ccnx-closure.cpp
rename to ccnx/ccnx-closure.cpp
diff --git a/include/ccnx-closure.h b/ccnx/ccnx-closure.h
similarity index 100%
rename from include/ccnx-closure.h
rename to ccnx/ccnx-closure.h
diff --git a/include/ccnx-common.h b/ccnx/ccnx-common.h
similarity index 100%
rename from include/ccnx-common.h
rename to ccnx/ccnx-common.h
diff --git a/src/ccnx-name.cpp b/ccnx/ccnx-name.cpp
similarity index 100%
rename from src/ccnx-name.cpp
rename to ccnx/ccnx-name.cpp
diff --git a/include/ccnx-name.h b/ccnx/ccnx-name.h
similarity index 100%
rename from include/ccnx-name.h
rename to ccnx/ccnx-name.h
diff --git a/src/ccnx-pco.cpp b/ccnx/ccnx-pco.cpp
similarity index 100%
rename from src/ccnx-pco.cpp
rename to ccnx/ccnx-pco.cpp
diff --git a/include/ccnx-pco.h b/ccnx/ccnx-pco.h
similarity index 100%
rename from include/ccnx-pco.h
rename to ccnx/ccnx-pco.h
diff --git a/src/ccnx-selectors.cpp b/ccnx/ccnx-selectors.cpp
similarity index 100%
rename from src/ccnx-selectors.cpp
rename to ccnx/ccnx-selectors.cpp
diff --git a/include/ccnx-selectors.h b/ccnx/ccnx-selectors.h
similarity index 100%
rename from include/ccnx-selectors.h
rename to ccnx/ccnx-selectors.h
diff --git a/src/ccnx-tunnel.cpp b/ccnx/ccnx-tunnel.cpp
similarity index 100%
rename from src/ccnx-tunnel.cpp
rename to ccnx/ccnx-tunnel.cpp
diff --git a/include/ccnx-tunnel.h b/ccnx/ccnx-tunnel.h
similarity index 100%
rename from include/ccnx-tunnel.h
rename to ccnx/ccnx-tunnel.h
diff --git a/src/ccnx-wrapper.cpp b/ccnx/ccnx-wrapper.cpp
similarity index 100%
rename from src/ccnx-wrapper.cpp
rename to ccnx/ccnx-wrapper.cpp
diff --git a/include/ccnx-wrapper.h b/ccnx/ccnx-wrapper.h
similarity index 100%
rename from include/ccnx-wrapper.h
rename to ccnx/ccnx-wrapper.h
diff --git "a/scheduler/.\043task.h" "b/scheduler/.\043task.h"
deleted file mode 120000
index 383dd59..0000000
--- "a/scheduler/.\043task.h"
+++ /dev/null
@@ -1 +0,0 @@
-cawka@cawka-mac.11861
\ No newline at end of file
diff --git a/scheduler/task.cc b/scheduler/task.cc
index 980df48..cfe48c1 100644
--- a/scheduler/task.cc
+++ b/scheduler/task.cc
@@ -22,7 +22,7 @@
 #include "task.h"
 #include "scheduler.h"
 
-void
+static void
 eventCallback(evutil_socket_t fd, short what, void *arg)
 {
   Task *task = static_cast<Task *>(arg);
diff --git a/client/client.cc b/test/client/client.cc
similarity index 100%
rename from client/client.cc
rename to test/client/client.cc
diff --git a/daemon/daemon.cc b/test/daemon/daemon.cc
similarity index 100%
rename from daemon/daemon.cc
rename to test/daemon/daemon.cc
diff --git a/daemon/notify-i.cc b/test/daemon/notify-i.cc
similarity index 100%
rename from daemon/notify-i.cc
rename to test/daemon/notify-i.cc
diff --git a/daemon/notify-i.h b/test/daemon/notify-i.h
similarity index 100%
rename from daemon/notify-i.h
rename to test/daemon/notify-i.h
diff --git a/wscript b/wscript
index 92949b7..c3b9516 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,6 @@
 
 VERSION='0.1'
 APPNAME='chronoshare'
-CCNXLIB='ccnxx'
 
 from waflib import Build, Logs
 
@@ -62,86 +61,45 @@
     conf.write_config_header('src/config.h')
 
 def build (bld):
-    common = bld.objects (
-        target = "common",
+    scheduler = bld.objects (
+        target = "scheduler",
         features = ["cxx"],
-        source = ['src/hash-helper.cc',
-                  'src/chronoshare-client.ice',
-                  ],
-        use = 'BOOST',
-        includes = ['include', 'src'],
+        source = bld.path.ant_glob(['scheduler/**/*.cc']),
+        use = 'BOOST BOOST_THREAD LIBEVENT LIBEVENT_PTHREADS',
+        includes = ['scheduler'],
         )
 
     libccnx = bld (
-        target=CCNXLIB,
-        features=['cxx', 'cxxshlib'],
-        source =  [
-            'src/ccnx-wrapper.cpp',
-            'src/ccnx-pco.cpp',
-            'src/ccnx-closure.cpp',
-            'src/ccnx-tunnel.cpp',
-            'src/object-db.cc',
-            'src/object-manager.cc',
-            'src/ccnx-name.cpp',
-            'src/ccnx-selectors.cpp',
-            'src/event-scheduler.cpp',
-            ],
-        use = 'BOOST BOOST_THREAD BOOST_FILESYSTEM SSL SQLITE3 CCNX common LIBEVENT LIBEVENT_PTHREADS',
-        includes = ['include', 'src'],
+        target="ccnx",
+        features=['cxx'],
+        source = bld.path.ant_glob(['ccnx/**/*.cc', 'ccnx/**/*.cpp']),
+        use = 'BOOST BOOST_THREAD SSL CCNX scheduler',
+        includes = ['ccnx', 'scheduler'],
         )
 
-    database = bld.objects (
-        target = "database",
-        features = ["cxx"],
-        source = [
-                  'src/db-helper.cc',
-                  'src/sync-log.cc',
-                  'src/action-log.cc',
-                  'src/action-item.proto',
-                  'src/sync-state.proto',
-                  'src/sync-core.cc',
-            ],
-        use = "BOOST SQLITE3 SSL common",
-        includes = ['include', 'src'],
+    chornoshare = bld (
+        target="chronoshare",
+        features=['cxx'],
+        source = bld.path.ant_glob(['src/**/*.cc', 'src/**/*.cpp', 'src/**/*.proto']),
+        use = "BOOST BOOST_FILESYSTEM scheduler ccnx",
+        includes = "ccnx scheduler src",
         )
-
+        
     # Unit tests
     if bld.env['TEST']:
       unittests = bld.program (
           target="unit-tests",
-          source = bld.path.ant_glob(['test/**/*.cc']),
+          source = bld.path.ant_glob(['test/*.cc']),
           features=['cxx', 'cxxprogram'],
-          use = 'BOOST_TEST BOOST_FILESYSTEM ccnxx database',
-          includes = ['include', 'src'],
+          use = 'BOOST_TEST BOOST_FILESYSTEM ccnx database chronoshare',
+          includes = "ccnx scheduler 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 = ['daemon/daemon.cc',
-                  'daemon/notify-i.cc',
-                  ],
-        use = "BOOST CCNX SSL SQLITE3 ICE common database ccnxx",
-        includes = ['include', 'src'],
-        )
-    
-
-
-    qt = bld (
-        target = "filewatcher",
-        features = "qt4 cxx cxxprogram",
-        defines = "WAF",
-        source = "filesystemwatcher/filesystemwatcher.cpp filesystemwatcher/simpleeventcatcher.cpp filesystemwatcher/main.cpp",
-        includes = "filesystemwatcher src include .",
-        use = "QTCORE QTGUI"
-        )
+    # qt = bld (
+    #     target = "filewatcher",
+    #     features = "qt4 cxx cxxprogram",
+    #     defines = "WAF",
+    #     source = "filesystemwatcher/filesystemwatcher.cpp filesystemwatcher/simpleeventcatcher.cpp filesystemwatcher/main.cpp",
+    #     includes = "filesystemwatcher src include .",
+    #     use = "QTCORE QTGUI"
+    #     )