diff --git a/lib/configuration.cc b/lib/configuration.cc
index 963b656bfdf5928368aef209a708fcf049035d95..08c7520d45d0ab045b50bac1026baae7817f831b 100644
--- a/lib/configuration.cc
+++ b/lib/configuration.cc
@@ -29,9 +29,9 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/configuration.h"
-#include "paxos-lib/lib/message.h"
+#include "lib/assert.h"
+#include "lib/configuration.h"
+#include "lib/message.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/lib/configuration.h b/lib/configuration.h
index 391ef7b56d68f165a891d17afcf5f06a58fdf432..c6b005578a2ebe3200b68d92026d7dd00a439914 100644
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -32,7 +32,7 @@
 #ifndef _LIB_CONFIGURATION_H_
 #define _LIB_CONFIGURATION_H_
 
-#include "paxos-lib/lib/viewstamp.h"
+#include "replication/vr/viewstamp.h"
 
 #include <fstream>
 #include <stdbool.h>
diff --git a/lib/latency.cc b/lib/latency.cc
index b2a6dcec483d25526e6becc100e78ecc0e470c6c..1b6a5333d5ec41daca86a8d820c3ce1009f30aaf 100644
--- a/lib/latency.cc
+++ b/lib/latency.cc
@@ -4,7 +4,9 @@
  * latency.cc:
  *   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
@@ -40,8 +42,8 @@
 #include <iostream>
 #include <fstream>
 
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/latency-format.pb.h"
+#include "lib/message.h"
+#include "lib/latency-format.pb.h"
 
 static struct Latency_t *latencyHead;
 
diff --git a/lib/simtransport.cc b/lib/simtransport.cc
index ce79c3a826f9d8c58e50e6bcabf8817cacfe46c7..743dfa1f39ff78ad8888bd4e85a3ffc1c1538d12 100644
--- a/lib/simtransport.cc
+++ b/lib/simtransport.cc
@@ -4,7 +4,9 @@
  * simtransport.cc:
  *   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
@@ -28,9 +30,9 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/simtransport.h"
+#include "lib/assert.h"
+#include "lib/message.h"
+#include "lib/simtransport.h"
 #include <google/protobuf/message.h>
 
 SimulatedTransportAddress::SimulatedTransportAddress(int addr)
diff --git a/lib/tests/configuration-test.cc b/lib/tests/configuration-test.cc
index 485c895f40c59e4605b2c5f9b48fec2663a64090..5a9a18a503e32456394e4e90536b34fb5d31fc1c 100644
--- a/lib/tests/configuration-test.cc
+++ b/lib/tests/configuration-test.cc
@@ -28,7 +28,7 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/configuration.h"
+#include "lib/configuration.h"
 
 #include <gtest/gtest.h>
 
diff --git a/lib/tests/simtransport-test.cc b/lib/tests/simtransport-test.cc
index d3387a58c958d2239f474cb1675eab9bd7ce148d..fbce3ad7648c153fc15845b1a9549ef3e1348c52 100644
--- a/lib/tests/simtransport-test.cc
+++ b/lib/tests/simtransport-test.cc
@@ -28,10 +28,10 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/configuration.h"
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/simtransport.h"
-#include "paxos-lib/lib/tests/simtransport-testmessage.pb.h"
+#include "lib/configuration.h"
+#include "lib/message.h"
+#include "lib/simtransport.h"
+#include "lib/tests/simtransport-testmessage.pb.h"
 
 #include <gtest/gtest.h>
 
diff --git a/lib/transport.cc b/lib/transport.cc
index d38c6ee1d79e12125dfa36eb377c408f8ae7b89f..1c00df408d0db0c94e37d9b373a51d90b8cb2925 100644
--- a/lib/transport.cc
+++ b/lib/transport.cc
@@ -4,7 +4,9 @@
  * transport.cc:
  *   message-passing network interface; common definitions
  *
- * 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
@@ -28,8 +30,8 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/transport.h"
+#include "lib/assert.h"
+#include "lib/transport.h"
 
 TransportReceiver::~TransportReceiver()
 {
diff --git a/lib/transport.h b/lib/transport.h
index 4d282e4ff801e01ea2be2f3ba80027f17d15ad5d..c725e574cdaaa787bf9ad97b50c38a59010091bd 100644
--- a/lib/transport.h
+++ b/lib/transport.h
@@ -31,7 +31,7 @@
 #ifndef _LIB_TRANSPORT_H_
 #define _LIB_TRANSPORT_H_
 
-#include "paxos-lib/lib/configuration.h"
+#include "lib/configuration.h"
 
 #include <google/protobuf/message.h>
 #include <functional>