diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..d0ccf0ed01e69f3da6bb46d83902adadcc19a162
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,255 @@
+#
+# Top-level makefile for OR-2PC
+#
+
+CC = gcc
+CXX = g++
+LD = g++
+EXPAND = lib/tmpl/expand
+
+CFLAGS := -g -Wall -pthread -iquote.obj/gen -Wno-uninitialized -levent_pthreads -O2 -DNASSERT
+#CFLAGS := -g -Wall -pthread -iquote.obj/gen -Wno-uninitialized -levent_pthreads
+CXXFLAGS := -g -std=c++0x -levent_pthreads
+LDFLAGS := -levent_pthreads
+## Debian package: check
+# CHECK_CFLAGS := $(shell pkg-config --cflags check)
+# CHECK_LDFLAGS := $(shell pkg-config --cflags --libs check)
+# Debian package: libprotobuf-dev
+PROTOBUF_CFLAGS := $(shell pkg-config --cflags protobuf)
+PROTOBUF_LDFLAGS := $(shell pkg-config --cflags --libs protobuf)
+CFLAGS += $(PROTOBUF_CFLAGS)
+LDFLAGS += $(PROTOBUF_LDFLAGS)
+PROTOC := protoc
+# Debian package: libevent-dev
+LIBEVENT_CFLAGS := $(shell pkg-config --cflags libevent)
+LIBEVENT_LDFLAGS := $(shell pkg-config --libs libevent)
+CFLAGS += $(LIBEVENT_CFLAGS)
+LDFLAGS += $(LIBEVENT_LDFLAGS)
+# Debian package: libssl-dev
+LIBSSL_CFLAGS := $(shell pkg-config --cflags libssl)
+LIBSSL_LDFLAGS := $(shell pkg-config --libs libssl)
+CFLAGS += $(LIBSSL_CFLAGS)
+LDFLAGS += $(LIBSSL_LDFLAGS)
+
+
+# Google test framework. This doesn't use pkgconfig
+GTEST_DIR := /usr/src/gtest
+
+# Additional flags
+PARANOID = 1
+ifneq ($(PARANOID),0)
+override CFLAGS += -DPARANOID=1
+$(info WARNING: Paranoid mode enabled)
+endif
+
+PERFTOOLS = 0
+ifneq ($(PERFTOOLS),0)
+override CFLAGS += -DPPROF=1
+override LDFLAGS += -lprofiler
+endif
+
+# Make sure all is the default
+.DEFAULT_GOAL := all
+
+# Eliminate default suffix rules
+.SUFFIXES:
+
+# Delete target files if there is an error (or make is interrupted)
+.DELETE_ON_ERROR:
+
+# make it so that no intermediate .o files are ever deleted
+.PRECIOUS: %.o
+
+##################################################################
+# Tracing
+#
+
+ifeq ($(V),1)
+trace = $(3)
+Q =
+else
+trace = @printf "+ %-6s " $(1) ; echo $(2) ; $(3)
+Q = @
+endif
+GTEST := .obj/gtest/gtest.a
+GTEST_MAIN := .obj/gtest/gtest_main.a
+
+##################################################################
+# Sub-directories
+#
+
+# The directory of the current make fragment. Each file should
+# redefine this at the very top with
+# d := $(dir $(lastword $(MAKEFILE_LIST)))
+d :=
+
+# The object directory corresponding to the $(d)
+o = .obj/$(d)
+
+# SRCS is the list of all non-test-related source files.
+SRCS :=
+# TEST_SRCS is just like SRCS, but these source files will be compiled
+# with testing related flags.
+TEST_SRCS :=
+# GTEST_SRCS is tests that use Google's testing framework
+GTEST_SRCS :=
+
+# PROTOS is the list of protobuf *.proto files
+PROTOS :=
+
+# BINS is a list of target names for non-test binaries. These targets
+# should depend on the appropriate object files, but should not
+# contain any commands.
+BINS :=
+# TEST_BINS is like BINS, but for test binaries. They will be linked
+# using the appropriate flags. This is also used as the list of tests
+# to run for the `test' target.
+TEST_BINS :=
+
+# add-CFLAGS is a utility macro that takes a space-separated list of
+# sources and a set of CFLAGS. It sets the CFLAGS for each provided
+# source. This should be used like
+#
+# $(call add-CFLAGS,$(d)a.c $(d)b.c,$(PG_CFLAGS))
+define add-CFLAGS
+$(foreach src,$(1),$(eval CFLAGS-$(src) += $(2)))
+endef
+
+# Like add-CFLAGS, but for LDFLAGS. This should be given a list of
+# binaries.
+define add-LDFLAGS
+$(foreach bin,$(1),$(eval LDFLAGS-$(bin) += $(2)))
+endef
+
+include lib/Rules.mk
+
+##################################################################
+# General rules
+#
+
+#
+# Protocols
+#
+PROTOOBJS := $(PROTOS:%.proto=.obj/%.o)
+PROTOSRCS := $(PROTOS:%.proto=.obj/gen/%.pb.cc)
+PROTOHEADERS := $(PROTOS:%.proto=%.pb.h)
+
+$(PROTOSRCS) : .obj/gen/%.pb.cc: %.proto
+ @mkdir -p .obj/gen
+ $(call trace,PROTOC,$^,$(PROTOC) --cpp_out=.obj/gen $^)
+
+#
+# Compilation
+#
+
+# -MD Enable dependency generation and compilation and output to the
+# .obj directory. -MP Add phony targets so make doesn't complain if
+# a header file is removed. -MT Explicitly set the target in the
+# generated rule to the object file we're generating.
+DEPFLAGS = -M -MF ${@:.o=.d} -MP -MT $@ -MG
+
+# $(call add-CFLAGS,$(TEST_SRCS),$(CHECK_CFLAGS))
+OBJS := $(SRCS:%.cc=.obj/%.o) $(TEST_SRCS:%.cc=.obj/%.o) $(GTEST_SRCS:%.cc=.obj/%.o)
+
+define compile
+ @mkdir -p $(dir $@)
+ $(call trace,$(1),$<,\
+ $(CC) -iquote. $(CFLAGS) $(CFLAGS-$<) $(2) $(DEPFLAGS) -E $<)
+ $(Q)$(CC) -iquote. $(CFLAGS) $(CFLAGS-$<) $(2) -E -o .obj/$*.t $<
+ $(Q)$(EXPAND) $(EXPANDARGS) -o .obj/$*.i .obj/$*.t
+ $(Q)$(CC) $(CFLAGS) $(CFLAGS-$<) $(2) -c -o $@ .obj/$*.i
+endef
+
+define compilecxx
+ @mkdir -p $(dir $@)
+ $(call trace,$(1),$<,\
+ $(CXX) -iquote. $(CFLAGS) $(CXXFLAGS) $(CFLAGS-$<) $(2) $(DEPFLAGS) -E $<)
+ $(Q)$(CXX) -iquote. $(CFLAGS) $(CXXFLAGS) $(CFLAGS-$<) $(2) -c -o $@ $<
+endef
+
+# All object files come in two flavors: regular and
+# position-independent. PIC objects end in -pic.o instead of just .o.
+# Link targets that build shared objects must depend on the -pic.o
+# versions.
+# Slightly different rules for protobuf object files
+# because their source files have different locations.
+
+$(OBJS): .obj/%.o: %.cc $(PROTOSRCS)
+ $(call compilecxx,CC,)
+
+$(OBJS:%.o=%-pic.o): .obj/%-pic.o: %.cc $(PROTOSRCS)
+ $(call compilecxx,CCPIC,-fPIC)
+
+$(PROTOOBJS): .obj/%.o: .obj/gen/%.pb.cc
+ $(call compilecxx,CC,)
+
+$(PROTOOBJS:%.o=%-pic.o): .obj/%-pic.o: .obj/gen/%.pb.cc $(PROTOSRCS)
+ $(call compilecxx,CCPIC,-fPIC)
+
+#
+# Linking
+#
+
+$(call add-LDFLAGS,$(TEST_BINS),$(CHECK_LDFLAGS))
+
+$(BINS) $(TEST_BINS): %:
+ $(call trace,LD,$@,$(LD) -o $@ $^ $(LDFLAGS) $(LDFLAGS-$@))
+
+#
+# Automatic dependencies
+#
+
+DEPS := $(OBJS:.o=.d) $(OBJS:.o=-pic.d)
+
+-include $(DEPS)
+
+#
+# Testing
+#
+GTEST_INTERNAL_SRCS := $(wildcard $(GTEST_DIR)/src/*.cc)
+GTEST_OBJS := $(patsubst %.cc,.obj/gtest/%.o,$(notdir $(GTEST_INTERNAL_SRCS)))
+
+$(GTEST_OBJS): .obj/gtest/%.o: $(GTEST_DIR)/src/%.cc
+ $(call compilecxx,CC,-I$(GTEST_DIR) -Wno-missing-field-initializers)
+
+$(GTEST) : .obj/gtest/gtest-all.o
+ $(call trace,AR,$@,$(AR) $(ARFLAGS) $@ $^)
+
+$(GTEST_MAIN) : .obj/gtest/gtest-all.o .obj/gtest/gtest_main.o
+ $(call trace,AR,$@,$(AR) $(ARFLAGS) $@ $^)
+
+#
+# Cleaning
+#
+
+.PHONY: clean
+clean:
+ $(call trace,RM,binaries,rm -f $(BINS) $(TEST_BINS))
+ $(call trace,RM,objects,rm -rf .obj)
+
+##################################################################
+# Targets
+#
+
+.PHONY: all
+all: $(BINS)
+
+$(TEST_BINS:%=run-%): run-%: %
+ $(call trace,RUN,$<,$<)
+
+$(TEST_BINS:%=gdb-%): gdb-%: %
+ $(call trace,GDB,$<,CK_FORK=no gdb $<)
+
+.PHONY: test
+test: $(TEST_BINS:%=run-%)
+.PHONY: check
+check: test
+
+.PHONY: TAGS
+TAGS:
+ $(Q)rm -f $@
+ $(call trace,ETAGS,sources,\
+ etags $(SRCS) $(TEST_SRCS))
+ $(call trace,ETAGS,headers,\
+ etags -a $(foreach dir,$(sort $(dir $(SRCS) $(TEST_SRCS))),\
+ $(wildcard $(dir)*.h)))
diff --git a/lib/assert.h b/lib/assert.h
index bc4f56a9fdd70ad94861b1c51b637ffb93acd6e2..0e18cbe9dcb109d1b0aba3c55bbb19ba11006452 100644
--- a/lib/assert.h
+++ b/lib/assert.h
@@ -4,7 +4,9 @@
* assert.h:
* assertion macros that integrate with the logging framework
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -40,7 +42,7 @@
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
-#include "paxos-lib/lib/message.h"
+#include "lib/message.h"
#define ASSERT(x) Assert(x)
diff --git a/lib/hash.h b/lib/hash.h
index 968460941b7bcbf30559832df1952271f3161981..b1ee88fdefc32e92983bf6ce586d2ef5d92008c2 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -4,7 +4,9 @@
* hash.h:
* header defining hash functions
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
* Copyright 2009-2012 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person
diff --git a/lib/latency.h b/lib/latency.h
index 7ffdf9d0ebc4fcc81dd3d9c0682f99bb855cebc0..4ffff98c01356d18a0e50e5e63040705b5fed6cb 100644
--- a/lib/latency.h
+++ b/lib/latency.h
@@ -4,7 +4,9 @@
* latency.h:
* latency profiling functions
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
* Copyright 2009-2012 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person
@@ -32,7 +34,7 @@
#ifndef _LIB_LATENCY_H_
#define _LIB_LATENCY_H_
-#include "paxos-lib/lib/latency-format.pb.h"
+#include "lib/latency-format.pb.h"
#include <stdbool.h>
#include <stdint.h>
diff --git a/lib/memory.h b/lib/memory.h
index 9fcbca35dc755e79c64199bc4e4f4cb5250cf610..b5e50a767744c390d6c6df8e03c8566a8d999842 100644
--- a/lib/memory.h
+++ b/lib/memory.h
@@ -4,7 +4,9 @@
* memory.h:
* parsing and pretty-printing of memory sizes
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
* Copyright 2009-2012 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person
diff --git a/lib/simtransport.h b/lib/simtransport.h
index 25bd681dcdbdc3f8aeab81552409c24ef0168b77..57e4ecf93f9ccdcda6d1d19d344620319a76520a 100644
--- a/lib/simtransport.h
+++ b/lib/simtransport.h
@@ -4,7 +4,9 @@
* simtransport.h:
* simulated message-passing interface for testing use
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -31,8 +33,8 @@
#ifndef _LIB_SIMTRANSPORT_H_
#define _LIB_SIMTRANSPORT_H_
-#include "paxos-lib/lib/transport.h"
-#include "paxos-lib/lib/transportcommon.h"
+#include "lib/transport.h"
+#include "lib/transportcommon.h"
#include <deque>
#include <map>
diff --git a/lib/timeval.h b/lib/timeval.h
index 9812cff60f47ba756ee998e9f73577fae6c38ed6..7a647263710e96349052a2ac34adddac40f61b86 100644
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -4,7 +4,9 @@
* timeval.h:
* utility functions for manipulating timevals
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
* Copyright 2009-2012 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person
diff --git a/lib/transportcommon.h b/lib/transportcommon.h
index b493c6e1165dfeb3f4dee6840f5b688ac4a23b96..7d175900d912efc61512a4565cd852c22aa9db7f 100644
--- a/lib/transportcommon.h
+++ b/lib/transportcommon.h
@@ -4,7 +4,9 @@
* transport-common.h:
* template support for implementing transports
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -31,9 +33,9 @@
#ifndef _LIB_TRANSPORTCOMMON_H_
#define _LIB_TRANSPORTCOMMON_H_
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/configuration.h"
-#include "paxos-lib/lib/transport.h"
+#include "lib/assert.h"
+#include "lib/configuration.h"
+#include "lib/transport.h"
#include <map>
#include <unordered_map>
diff --git a/lib/viewstamp.h b/replication/vr/viewstamp.h
similarity index 100%
rename from lib/viewstamp.h
rename to replication/vr/viewstamp.h