diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5e3d33..f5ac71b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ Project(Stasis)
 
 SET(PACKAGE_VERSION 1)
 
-SUBDIRS(test util benchmarks main)
+SUBDIRS(test util benchmarks servers/native)
 
 # Main decisions
 SET(BUILD_SHARED_LIBS ON)
@@ -80,7 +80,5 @@ ENDIF ( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
 
 #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 IF ( HAVE_STASIS )
-  ADD_LIBRARY(blsm requestDispatch.cpp simpleServer.cpp logserver.cpp blsm.cpp diskTreeComponent.cpp memTreeComponent.cpp datapage.cpp merger.cpp tuplemerger.cpp mergeStats.cpp mergeManager.cpp bloomFilter.c)
+  ADD_LIBRARY(blsm blsm.cpp diskTreeComponent.cpp memTreeComponent.cpp datapage.cpp merger.cpp tuplemerger.cpp mergeStats.cpp mergeManager.cpp bloomFilter.c)
 ENDIF ( HAVE_STASIS )
-
-ADD_LIBRARY(blsm_client tcpclient.cpp)
diff --git a/datatuple.h b/datatuple.h
index 3395a7a..ecbac64 100644
--- a/datatuple.h
+++ b/datatuple.h
@@ -17,17 +17,17 @@
  *
  *      Author: sears
  */
-#include <network.h>
-
 #ifndef _DATATUPLE_H_
 #define _DATATUPLE_H_
 
 #include <string>
 #include <stdlib.h>
-typedef unsigned char byte;
+#include <stasis/common.h>
 #include <cstring>
 #include <assert.h>
 
+typedef uint32_t len_t ;
+static const len_t DELETE = ((len_t)0) - 1;
 
 typedef struct datatuple
 {
diff --git a/benchmarks/CMakeLists.txt b/servers/native/benchmarks/CMakeLists.txt
similarity index 100%
rename from benchmarks/CMakeLists.txt
rename to servers/native/benchmarks/CMakeLists.txt
diff --git a/benchmarks/lsm_microbenchmarks.cpp b/servers/native/benchmarks/lsm_microbenchmarks.cpp
similarity index 99%
rename from benchmarks/lsm_microbenchmarks.cpp
rename to servers/native/benchmarks/lsm_microbenchmarks.cpp
index c8f77ed..076e249 100644
--- a/benchmarks/lsm_microbenchmarks.cpp
+++ b/servers/native/benchmarks/lsm_microbenchmarks.cpp
@@ -21,7 +21,7 @@
 #include <stasis/common.h>
 #include <stasis/util/time.h>
 #include <stdio.h>
-#include <logserver.h>
+#include <blsm.h>
 #include <regionAllocator.h>
 
 BEGIN_C_DECLS
diff --git a/benchmarks/tcpclient_noop.cpp b/servers/native/benchmarks/tcpclient_noop.cpp
similarity index 96%
rename from benchmarks/tcpclient_noop.cpp
rename to servers/native/benchmarks/tcpclient_noop.cpp
index 2834e9a..8a33bb5 100644
--- a/benchmarks/tcpclient_noop.cpp
+++ b/servers/native/benchmarks/tcpclient_noop.cpp
@@ -20,15 +20,15 @@
  *      Author: sears
  */
 
-#include "../tcpclient.h"
+#include "..tcpclient.h"
 #include "../network.h"
-#include "../datatuple.h"
+#include "datatuple.h"
 
 void usage(char * argv[]) {
     fprintf(stderr, "usage %s numthreads threadopcount [host [port]]\n", argv[0]);
 }
 
-#include "../util/util_main.h"
+#include "../servers/native/util/util_main.h"
 #include <sys/time.h>
 int threadopcount;
 
diff --git a/logserver.cpp b/servers/native/logserver.cpp
similarity index 100%
rename from logserver.cpp
rename to servers/native/logserver.cpp
diff --git a/logserver.h b/servers/native/logserver.h
similarity index 100%
rename from logserver.h
rename to servers/native/logserver.h
diff --git a/network.h b/servers/native/network.h
similarity index 99%
rename from network.h
rename to servers/native/network.h
index 733442a..936dffb 100644
--- a/network.h
+++ b/servers/native/network.h
@@ -32,9 +32,6 @@ typedef unsigned char byte;
 
 typedef uint8_t network_op_t;
 
-typedef uint32_t len_t ;
-static const len_t DELETE = ((len_t)0) - 1;
-
 #define LOGSTORE_NODELAY
 
 #include <datatuple.h>
diff --git a/main/newserver.cpp b/servers/native/newserver.cpp
similarity index 100%
rename from main/newserver.cpp
rename to servers/native/newserver.cpp
diff --git a/requestDispatch.cpp b/servers/native/requestDispatch.cpp
similarity index 100%
rename from requestDispatch.cpp
rename to servers/native/requestDispatch.cpp
diff --git a/requestDispatch.h b/servers/native/requestDispatch.h
similarity index 100%
rename from requestDispatch.h
rename to servers/native/requestDispatch.h
diff --git a/main/server.cpp b/servers/native/server.cpp
similarity index 100%
rename from main/server.cpp
rename to servers/native/server.cpp
diff --git a/simpleServer.cpp b/servers/native/simpleServer.cpp
similarity index 100%
rename from simpleServer.cpp
rename to servers/native/simpleServer.cpp
diff --git a/simpleServer.h b/servers/native/simpleServer.h
similarity index 100%
rename from simpleServer.h
rename to servers/native/simpleServer.h
diff --git a/tcpclient.cpp b/servers/native/tcpclient.cpp
similarity index 100%
rename from tcpclient.cpp
rename to servers/native/tcpclient.cpp
diff --git a/tcpclient.h b/servers/native/tcpclient.h
similarity index 100%
rename from tcpclient.h
rename to servers/native/tcpclient.h
diff --git a/util/CMakeLists.txt b/servers/native/util/CMakeLists.txt
similarity index 100%
rename from util/CMakeLists.txt
rename to servers/native/util/CMakeLists.txt
diff --git a/util/change_log_mode.cpp b/servers/native/util/change_log_mode.cpp
similarity index 100%
rename from util/change_log_mode.cpp
rename to servers/native/util/change_log_mode.cpp
diff --git a/util/copy_database.cpp b/servers/native/util/copy_database.cpp
similarity index 100%
rename from util/copy_database.cpp
rename to servers/native/util/copy_database.cpp
diff --git a/util/drop_database.cpp b/servers/native/util/drop_database.cpp
similarity index 100%
rename from util/drop_database.cpp
rename to servers/native/util/drop_database.cpp
diff --git a/util/dump_blockmap.cpp b/servers/native/util/dump_blockmap.cpp
similarity index 100%
rename from util/dump_blockmap.cpp
rename to servers/native/util/dump_blockmap.cpp
diff --git a/util/histogram.cpp b/servers/native/util/histogram.cpp
similarity index 100%
rename from util/histogram.cpp
rename to servers/native/util/histogram.cpp
diff --git a/util/shutdown.cpp b/servers/native/util/shutdown.cpp
similarity index 100%
rename from util/shutdown.cpp
rename to servers/native/util/shutdown.cpp
diff --git a/util/space_usage.cpp b/servers/native/util/space_usage.cpp
similarity index 100%
rename from util/space_usage.cpp
rename to servers/native/util/space_usage.cpp
diff --git a/util/util_main.h b/servers/native/util/util_main.h
similarity index 100%
rename from util/util_main.h
rename to servers/native/util/util_main.h
diff --git a/test/check_tcpbulkinsert.cpp b/test/check_tcpbulkinsert.cpp
index 678793e..c753f04 100644
--- a/test/check_tcpbulkinsert.cpp
+++ b/test/check_tcpbulkinsert.cpp
@@ -32,8 +32,8 @@
 #include <time.h>
 #include <sys/types.h>
 
-#include "../tcpclient.h"
-#include "../network.h"
+#include "../servers/native/tcpclient.h"
+#include "../servers/native/network.h"
 
 #include "check_util.h"
 
diff --git a/test/check_tcpclient.cpp b/test/check_tcpclient.cpp
index 4ef1589..ad7cb61 100644
--- a/test/check_tcpclient.cpp
+++ b/test/check_tcpclient.cpp
@@ -30,8 +30,8 @@
 #include <time.h>
 #include <sys/types.h> 
 
-#include "../tcpclient.h"
-#include "../network.h"
+#include "../servers/native/tcpclient.h"
+#include "../servers/native/network.h"
 
 #include "check_util.h"