diff --git a/abp/__init__.py b/abp/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/graph.py b/abp/graph.py
similarity index 100%
rename from graph.py
rename to abp/graph.py
diff --git a/make_tables.py b/abp/make_tables.py
similarity index 95%
rename from make_tables.py
rename to abp/make_tables.py
index 11da1ec..a8b6c33 100644
--- a/make_tables.py
+++ b/abp/make_tables.py
@@ -70,7 +70,7 @@ def get_conjugation_table(unitaries):
 def get_times_table(unitaries):
     """ Construct the times-table """
     return np.array([[find_clifford(u.dot(v), unitaries) for v in unitaries]
-                     for u in tqdm(unitaries)])
+                     for u in tqdm(unitaries, desc="Building times-table")])
 
 
 def get_state_table():
@@ -90,7 +90,8 @@ def get_cz_table(unitaries):
     state_table = get_state_table()
 
     cz_table = np.zeros((2, 24, 24, 3))
-    for bond, c1, c2 in tqdm(list(it.product([0, 1], range(24), range(24)))):
+    rows = list(it.product([0, 1], range(24), range(24)))
+    for bond, c1, c2 in tqdm(rows, desc="Building CZ table"):
         cz_table[bond, c1, c2] = find_cz(bond, c1, c2, commuters, state_table)
     return cz_table
 
diff --git a/qi.py b/abp/qi.py
similarity index 100%
rename from qi.py
rename to abp/qi.py
diff --git a/viz.py b/abp/viz.py
similarity index 100%
rename from viz.py
rename to abp/viz.py