-RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c
-TEST_SRCS := $(RUNTIME_SRCS) test/CuTest.c
-rcu_test_SRCS := $(TEST_SRCS)
-list_test_SRCS := $(TEST_SRCS) struct/list.c
-ht_test_SRCS := $(TEST_SRCS) struct/ht.c test/ht_test.c
-txn_test_SRCS := $(TEST_SRCS) struct/ht.c txn/txn.c
+RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c datatype/nstring.c
+MAP_SRCS := map/map.c map/list.c map/skiplist.c map/hashtable.c