diff --git a/Makefile b/Makefile
index 0ffa394..4c1ff5c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,21 +5,21 @@ INC = -I ../stasis 							\
       -I ../mapkeeper/thrift/gen-cpp/ 					\
       -I $(THRIFT_DIR)/include/ 					\
       -I $(THRIFT_DIR)/include/thrift					\
-      -I ./sherpa
+      -I ./servers/mapkeeper
 
 LIBSRC = $(wildcard *.c) $(wildcard *.cpp)
 LIBNAME = blsm
 
 ifeq ($(shell uname),Linux)
 STATIC_LIBS= ../mapkeeper/thrift/gen-cpp/libmapkeeper.a	\
-	 -lrt sherpa/LSMServerHandler.cc bin/libblsm.a		\
+	 -lrt servers/mapkeeper/bLSMRequestHandler.cpp bin/libblsm.a		\
 	../stasis/bin/libstasis.a
 else
 STATIC_LIBS= ./libstdc++.a ../mapkeeper/thrift/gen-cpp/libmapkeeper.a	\
-	 sherpa/LSMServerHandler.cc bin/libblsm.a			\
+	 servers/mapkeeper/bLSMRequestHandler.cpp bin/libblsm.a			\
 	../stasis/bin/libstasis.a
 endif
 
-MAINSRC = $(wildcard main/*.cpp) $(wildcard sherpa/main/*.cc)
+MAINSRC = $(wildcard servers/native-XXX/*.cpp) $(wildcard servers/mapkeeper/main/*.cpp)
 
 include ../stasis/config/Makefile.stasis