diff --git a/Makefile b/data_sync/Makefile
similarity index 100%
rename from Makefile
rename to data_sync/Makefile
diff --git a/README.md b/data_sync/README.md
similarity index 100%
rename from README.md
rename to data_sync/README.md
diff --git a/sync.proto b/data_sync/sync.proto
similarity index 100%
rename from sync.proto
rename to data_sync/sync.proto
diff --git a/data_sync/sync.py b/data_sync/sync.py
index 8c6eb4e..d6d5fe1 100644
--- a/data_sync/sync.py
+++ b/data_sync/sync.py
@@ -49,7 +49,4 @@ a.append_message("a0")
 a.send_message("B", "a0")
 print a.sync_state["a0"]
 
-
-# Maybe good idea to read the spec yeh
-# Stupid not to use the protobuf stuff IMO
-# Lets reorg
+# TODO: Use the actual protobufs
diff --git a/sync_pb2.py b/data_sync/sync_pb2.py
similarity index 100%
rename from sync_pb2.py
rename to data_sync/sync_pb2.py
diff --git a/test.py b/data_sync/test.py
similarity index 100%
rename from test.py
rename to data_sync/test.py
diff --git a/sync.py b/sync.py
deleted file mode 100644
index d6d5fe1..0000000
--- a/sync.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Sync protocol PoC
-
-# TODO: Expand message to be a payload with message hash
-# TODO: Add support for multiple peers
-# TODO: Introduce latency and unreliability
-# TODO: send_time should be time
-# TODO: Use .proto files
-
-class Node():
-    def __init__(self, name):
-        self.name = name
-        self.log = []
-        self.sync_state = {}
-        self.peers = {}
-
-    def append_message(self, message):
-        self.log.append(message)
-        self.sync_state[message] = {"hold_flag": 0,
-                                    "ack_flag": 0,
-                                    "request_flag": 0,
-                                    "send_count": 0,
-                                    "send_time": 0}
-
-    def send_message(self, peer, message):
-        # TODO: Use peer to update sync_state
-        self.sync_state[message]["send_count"] = 1
-        self.sync_state[message]["send_time"] = 1
-
-        # XXX: Tightly coupled
-        receiver = self.peers[peer]
-        receiver.receive_message(self.name, message)
-
-    def receive_message(self, sender, message):
-        print "received message", sender, message
-        # Should be of certain type
-        # TODO: Acknowledge message
-
-# Mock
-
-a = Node("A")
-b = Node("B")
-
-a.peers["B"] = b
-b.peers["A"] = a
-
-a.append_message("a0")
-
-# TODO: send_message should be based on send_time
-a.send_message("B", "a0")
-print a.sync_state["a0"]
-
-# TODO: Use the actual protobufs