diff --git a/.gitignore b/.gitignore
index ba9d174..91e6dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ src/dataset/data/*
 src/dataset/nclt
 !src/dataset/data/*.py
 
-__pycache__
+# Ignore pycache
+__pycache__/
diff --git a/src/dataset/dataManipulation/GPSmanip.py b/src/dataset/data_manip/GPSmanip.py
similarity index 100%
rename from src/dataset/dataManipulation/GPSmanip.py
rename to src/dataset/data_manip/GPSmanip.py
diff --git a/src/dataset/dataManipulation/findBuildingCoord.py b/src/dataset/data_manip/findBuildingCoord.py
similarity index 100%
rename from src/dataset/dataManipulation/findBuildingCoord.py
rename to src/dataset/data_manip/findBuildingCoord.py
diff --git a/src/dataset/dataManipulation/pickles/BuildingMappings.pkl b/src/dataset/data_manip/pickles/BuildingMappings.pkl
similarity index 100%
rename from src/dataset/dataManipulation/pickles/BuildingMappings.pkl
rename to src/dataset/data_manip/pickles/BuildingMappings.pkl
diff --git a/src/dataset/dataManipulation/pickles/BuildingMappings.txt b/src/dataset/data_manip/pickles/BuildingMappings.txt
similarity index 100%
rename from src/dataset/dataManipulation/pickles/BuildingMappings.txt
rename to src/dataset/data_manip/pickles/BuildingMappings.txt
diff --git a/src/dataset/dataManipulation/pickles/pickleManage.py b/src/dataset/data_manip/pickles/pickleManage.py
similarity index 100%
rename from src/dataset/dataManipulation/pickles/pickleManage.py
rename to src/dataset/data_manip/pickles/pickleManage.py
diff --git a/src/dataset/dataManipulation/pickles/referenceBuildings4Pickle.txt b/src/dataset/data_manip/pickles/referenceBuildings4Pickle.txt
similarity index 100%
rename from src/dataset/dataManipulation/pickles/referenceBuildings4Pickle.txt
rename to src/dataset/data_manip/pickles/referenceBuildings4Pickle.txt
diff --git a/src/dataset/ManageDataset/project_vel_to_cam.py b/src/dataset/read_dataset/project_vel_to_cam.py
similarity index 100%
rename from src/dataset/ManageDataset/project_vel_to_cam.py
rename to src/dataset/read_dataset/project_vel_to_cam.py
diff --git a/src/dataset/ManageDataset/read_gps.py b/src/dataset/read_dataset/read_gps.py
similarity index 100%
rename from src/dataset/ManageDataset/read_gps.py
rename to src/dataset/read_dataset/read_gps.py
diff --git a/src/dataset/ManageDataset/read_ground_truth.py b/src/dataset/read_dataset/read_ground_truth.py
similarity index 100%
rename from src/dataset/ManageDataset/read_ground_truth.py
rename to src/dataset/read_dataset/read_ground_truth.py
diff --git a/src/dataset/ManageDataset/read_hokuyo_30m.py b/src/dataset/read_dataset/read_hokuyo_30m.py
similarity index 100%
rename from src/dataset/ManageDataset/read_hokuyo_30m.py
rename to src/dataset/read_dataset/read_hokuyo_30m.py
diff --git a/src/dataset/ManageDataset/read_hokuyo_4m.py b/src/dataset/read_dataset/read_hokuyo_4m.py
similarity index 100%
rename from src/dataset/ManageDataset/read_hokuyo_4m.py
rename to src/dataset/read_dataset/read_hokuyo_4m.py
diff --git a/src/dataset/ManageDataset/read_ms25.py b/src/dataset/read_dataset/read_ms25.py
similarity index 100%
rename from src/dataset/ManageDataset/read_ms25.py
rename to src/dataset/read_dataset/read_ms25.py
diff --git a/src/dataset/ManageDataset/read_ms25_euler.py b/src/dataset/read_dataset/read_ms25_euler.py
similarity index 100%
rename from src/dataset/ManageDataset/read_ms25_euler.py
rename to src/dataset/read_dataset/read_ms25_euler.py
diff --git a/src/dataset/ManageDataset/read_odom.py b/src/dataset/read_dataset/read_odom.py
similarity index 100%
rename from src/dataset/ManageDataset/read_odom.py
rename to src/dataset/read_dataset/read_odom.py
diff --git a/src/dataset/read_dataset/read_vel_hits.py b/src/dataset/read_dataset/read_vel_hits.py
new file mode 100644
index 0000000..3d683f1
--- /dev/null
+++ b/src/dataset/read_dataset/read_vel_hits.py
@@ -0,0 +1,89 @@
+# !/usr/bin/python
+#
+# Example code to go through the velodyne_hits.bin
+# file and read timestamps, number of hits, and the
+# hits in each packet.
+#
+#
+# To call:
+#
+#   python read_vel_hits.py velodyne.bin
+#
+
+import sys
+import struct
+
+def convert(x_s, y_s, z_s):
+
+    scaling = 0.005 # 5 mm
+    offset = -100.0
+
+    x = x_s * scaling + offset
+    y = y_s * scaling + offset
+    z = z_s * scaling + offset
+
+    return x, y, z
+
+def verify_magic(s):
+
+    magic = 44444
+
+    m = struct.unpack('<HHHH', s)
+
+    return len(m)>=4 and m[0] == magic and m[1] == magic and m[2] == magic and m[3] == magic
+
+def main(args):
+
+    if len(sys.argv) < 2:
+        print("Please specify input bin file")
+        return 1
+
+    f_bin = open(sys.argv[1], "rb")
+
+    total_hits = 0
+    first_utime = -1
+    last_utime = -1
+
+    while True:
+        magic = f_bin.read(8)
+        if magic == '': # eof
+            break
+
+        if not verify_magic(magic):
+            print("Could not verify magic")
+
+        num_hits = struct.unpack('<I', f_bin.read(4))[0]
+        utime = struct.unpack('<Q', f_bin.read(8))[0]
+
+        padding = f_bin.read(4) # padding
+
+        print("Have %d hits for utime %ld" % (num_hits, utime))
+
+        total_hits += num_hits
+        if first_utime == -1:
+            first_utime = utime
+        last_utime = utime
+
+        for i in range(num_hits):
+
+            x = struct.unpack('<H', f_bin.read(2))[0]
+            y = struct.unpack('<H', f_bin.read(2))[0]
+            z = struct.unpack('<H', f_bin.read(2))[0]
+            i = struct.unpack('B', f_bin.read(1))[0]
+            l = struct.unpack('B', f_bin.read(1))[0]
+
+            x, y, z = convert(x, y, z)
+            s = "%5.3f, %5.3f, %5.3f, %d, %d" % (x, y, z, i, l)
+
+            print(s)
+
+        raw_input("Press enter to continue...")
+
+    f_bin.close()
+
+    print("Read %d total hits from %ld to %ld" % (total_hits, first_utime, last_utime))
+
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
diff --git a/src/dataset/read_dataset/read_vel_sync.py b/src/dataset/read_dataset/read_vel_sync.py
new file mode 100644
index 0000000..3567e76
--- /dev/null
+++ b/src/dataset/read_dataset/read_vel_sync.py
@@ -0,0 +1,123 @@
+# !/usr/bin/python
+#
+# Example code to read a velodyne_sync/[utime].bin file
+# Plots the point cloud using matplotlib. Also converts
+# to a CSV if desired.
+#
+# To call:
+#
+#   python read_vel_sync.py velodyne.bin [out.csv]
+#
+
+import sys
+import struct
+import matplotlib.pyplot as plt
+from mpl_toolkits.mplot3d import Axes3D
+import numpy as np
+
+def convert(x_s, y_s, z_s):
+
+    scaling = 0.005 # 5 mm
+    offset = -100.0
+
+    x = x_s * scaling + offset
+    y = y_s * scaling + offset
+    z = z_s * scaling + offset
+
+    return x, y, z
+
+def generate_plot(bin_file):
+    f_bin = None
+
+    try:
+        f_bin = open(bin_file, "rb")
+    except IOError:
+        print('Failed to open velodyne file')
+        return 1
+
+    hits = []
+
+    while True:
+        x_str = f_bin.read(2)
+        if x_str == b'': # eof
+            break
+
+        x = struct.unpack('<H', x_str)[0]
+        y = struct.unpack('<H', f_bin.read(2))[0]
+        z = struct.unpack('<H', f_bin.read(2))[0]
+        i = struct.unpack('B', f_bin.read(1))[0]
+        l = struct.unpack('B', f_bin.read(1))[0]
+
+        x, y, z = convert(x, y, z)
+
+        s = "%5.3f, %5.3f, %5.3f, %d, %d" % (x, y, z, i, l)
+
+        if f_csv:
+            f_csv.write('%s\n' % s)
+
+        hits += [[x, y, z]]
+
+    f_bin.close()
+
+    hits = np.asarray(hits)
+
+    fig = plt.figure()
+    ax = fig.add_subplot(111, projection='3d')
+    ax.scatter(hits[:, 0], hits[:, 1], -hits[:, 2], c=-hits[:, 2], s=5, linewidths=0)
+    plt.show()
+
+    return 0    
+
+def main(args):
+
+    if len(sys.argv) < 2:
+        print('Please specify velodyne file')
+        return 1
+
+    f_bin = open(sys.argv[1], "rb")
+
+    if len(sys.argv) >= 3:
+        print('Writing to ', sys.argv[2])
+        f_csv = open(sys.argv[2], "w")
+    else:
+        f_csv = None
+
+    hits = []
+
+    while True:
+
+        x_str = f_bin.read(2)
+        if x_str == b'': # eof
+            break
+
+        x = struct.unpack('<H', x_str)[0]
+        y = struct.unpack('<H', f_bin.read(2))[0]
+        z = struct.unpack('<H', f_bin.read(2))[0]
+        i = struct.unpack('B', f_bin.read(1))[0]
+        l = struct.unpack('B', f_bin.read(1))[0]
+
+        x, y, z = convert(x, y, z)
+
+        s = "%5.3f, %5.3f, %5.3f, %d, %d" % (x, y, z, i, l)
+
+        if f_csv:
+            f_csv.write('%s\n' % s)
+
+        hits += [[x, y, z]]
+
+    f_bin.close()
+
+    if f_csv:
+        f_csv.close()
+
+    hits = np.asarray(hits)
+
+    fig = plt.figure()
+    ax = fig.add_subplot(111, projection='3d')
+    ax.scatter(hits[:, 0], hits[:, 1], -hits[:, 2], c=-hits[:, 2], s=5, linewidths=0)
+    plt.show()
+
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
diff --git a/src/dataset/ManageDataset/undistort.py b/src/dataset/read_dataset/undistort.py
similarity index 100%
rename from src/dataset/ManageDataset/undistort.py
rename to src/dataset/read_dataset/undistort.py
diff --git a/src/visualization/point_cloud_vis.py b/src/visualization/point_cloud_vis.py
new file mode 100644
index 0000000..77fc142
--- /dev/null
+++ b/src/visualization/point_cloud_vis.py
@@ -0,0 +1,170 @@
+# !/usr/bin/python
+#
+#   python point_cloud_vis.py \
+#          /PATH/TO/ground_truth.csv \
+#          /PATH/TO/velodyne_sync
+
+import sys
+import os
+import struct
+import matplotlib.pyplot as plt
+from mpl_toolkits.mplot3d import Axes3D
+import numpy as np
+from scipy.spatial.transform import Rotation as R
+
+
+class GTPoses:
+    def __init__(self, time_list, x_list, y_list, z_list, r_list, p_list, h_list):
+        self.time_list = time_list
+        self.x_list = x_list
+        self.y_list = y_list
+        self.z_list = z_list
+        self.r_list = r_list
+        self.p_list = p_list
+        self.h_list = h_list
+        self.length = len(time_list)
+
+class PointCloud:
+    def __init__(self, time):
+        self.time = time
+        self.x_list = []
+        self.y_list = []
+        self.z_list = []
+        self.length = 0
+    
+    def add_point(self, x, y, z):
+        self.x_list += [x]
+        self.y_list += [y]
+        self.z_list += [z]
+        self.length += 1
+
+
+def read_gt(file):
+    gt = np.loadtxt(file, delimiter=",")
+    
+    time_list = list(gt[:, 0])
+    x_list = gt[:, 1]
+    y_list = gt[:, 2]
+    z_list = gt[:, 3]
+    r_list = gt[:, 4]
+    p_list = gt[:, 5]
+    h_list = gt[:, 6]
+
+    return GTPoses(time_list, x_list, y_list, z_list, r_list, p_list, h_list)
+
+
+def convert(x_s, y_s, z_s):
+    scaling = 0.005 # 5 mm
+    offset = -100.0
+
+    x = x_s * scaling + offset
+    y = y_s * scaling + offset
+    z = z_s * scaling + offset
+
+    return x, y, z
+
+
+def read_vel(file):
+    time = os.path.splitext(os.path.basename(file))[0]
+    pc = PointCloud(time)
+    f_bin = open(file, "rb")
+    
+    while True:
+        x_str = f_bin.read(2)
+
+        if x_str == b'': # eof
+            break
+        
+        x = struct.unpack('<H', x_str)[0]
+        y = struct.unpack('<H', f_bin.read(2))[0]
+        z = struct.unpack('<H', f_bin.read(2))[0]
+        i = struct.unpack('B', f_bin.read(1))[0]
+        l = struct.unpack('B', f_bin.read(1))[0]
+
+        # TODO: Be careful about z being flipped when plotting the velodyne data
+        x, y, z = convert(x, y, z)
+        pc.add_point(x, y, -z)
+    
+    f_bin.close()
+    return pc
+
+
+def r_to_g_frame(gt, pc):
+    pc_global = PointCloud(pc.time)
+    
+    # Interpolate gt to find corresponding pose for pc
+    t_x = np.interp(x=pc.time, xp=gt.time_list, fp=gt.x_list)
+    t_y = np.interp(x=pc.time, xp=gt.time_list, fp=gt.y_list)
+    t_z = np.interp(x=pc.time, xp=gt.time_list, fp=gt.z_list)
+    R_r = np.interp(x=pc.time, xp=gt.time_list, fp=gt.r_list)
+    R_p = np.interp(x=pc.time, xp=gt.time_list, fp=gt.p_list)
+    R_h = np.interp(x=pc.time, xp=gt.time_list, fp=gt.h_list)
+
+    # Transform pc from robot frame to global frame
+    r = (R.from_euler('xyz', [R_r, R_p, R_h], degrees=False)).as_matrix()
+    p = [t_x, t_y, t_z]
+    n = [r[0,0], r[1,0], r[2,0]]
+    o = [r[0,1], r[1,1], r[2,1]]
+    a = [r[0,2], r[1,2], r[2,2]]
+
+    T = np.matrix([[n[0], o[0], a[0], p[0]],
+                   [n[1], o[1], a[1], p[1]],
+                   [n[2], o[2], a[2], p[2]],
+                   [0, 0, 0, 1]])
+    # T = np.matrix([[n[0], n[1], n[2], -np.dot(p, n)],
+    #                [o[0], o[1], o[2], -np.dot(p, o)],
+    #                [a[0], a[1], a[2], -np.dot(p, a)],
+    #                [0, 0, 0, 1]])
+    
+    for i in range(pc.length):
+        point_local = np.matrix([[pc.x_list[i]],
+                                 [pc.y_list[i]],
+                                 [pc.z_list[i]],
+                                 [1]])
+        point_global = T * point_local
+        pc_global.add_point(point_global[0], point_global[1], point_global[2])
+
+    return pc_global
+
+
+def main(args):
+    if len(sys.argv) != 3:
+        print("Expecting 3 arguments: python point_cloud_vis.py [ground truth filepath] [velodyne sync folder]")
+        return 1
+    
+    ground_truth_file = sys.argv[1]
+    data_path = sys.argv[2]
+
+    x_list = []
+    y_list = []
+    z_list = []
+    gt = read_gt(ground_truth_file)
+    
+    fig = plt.figure()
+    ax = fig.add_subplot(111, projection='3d')
+
+    count = -1
+
+    for filename in os.listdir(data_path):
+        count += 1
+
+        if count == 50:
+            break
+        elif count % 5 != 0:
+            continue
+
+        pc = read_vel(data_path + '/' + filename)
+        pc = r_to_g_frame(gt, pc)
+        
+        x_list += pc.x_list
+        y_list += pc.y_list
+        z_list += pc.z_list
+
+    ax.scatter(x_list, y_list, z_list, c=z_list, s=5, linewidths=0)
+    plt.show()
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))