diff --git a/.gitignore b/.gitignore
index c5ae425..58f2c8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-python/__pycache__/**/*
-cpp/haverscan
-cpp/haverstrtok
-data_10000000_flex.json
+haversine/python/__pycache__/**/*
+haversine/cpp/haverscan
+haversine/cpp/haverstrtok
+haversine/data_10000000_flex.json
diff --git a/Makefile b/Makefile
index 59a89d1..f6795ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
-mk_fscanf:
-	clang++ -g cpp/fscanf.cpp cpp/haversine.cpp -o cpp/haverscan
+mk_haversine_fscanf:
+	clang++ -g haversine/cpp/fscanf.cpp haversine/cpp/haversine.cpp -o haversine/cpp/haverscan
 
-run_fscanf:
-	./cpp/haverscan
+run_haversine_fscanf:
+	cd ./haversine/cpp && ./haverscan
 
-mk_strtok:
-	clang++ -g cpp/strtok.cpp cpp/haversine.cpp -o cpp/haverstrtok
+mk_haversine_strtok:
+	clang++ -g haversine/cpp/strtok.cpp haversine/cpp/haversine.cpp -o haversine/cpp/haverstrtok
 
-run_strtok:
-	./cpp/haverstrtok
+run_haversine_strtok:
+	cd ./haversine/cpp && ./haverstrtok
 
-run_python_json:
-	python ./python/haversine_json.py
+run_haversine_python_json:
+	python ./haversine/python/haversine_json.py
diff --git a/cpp/fscanf.cpp b/haversine/cpp/fscanf.cpp
similarity index 87%
rename from cpp/fscanf.cpp
rename to haversine/cpp/fscanf.cpp
index e787c4e..ba5b0ae 100644
--- a/cpp/fscanf.cpp
+++ b/haversine/cpp/fscanf.cpp
@@ -24,13 +24,9 @@ struct Item {
 
 int main(int argc, char *argv[]) {
 #if DEBUG
-  FILE *fp = fopen("/home/abdelrahman/Sources/dev/"
-                   "performance_aware_programming/test_data.json",
-                   "rb");
+  FILE *fp = fopen("../test_data.json", "rb");
 #else
-  FILE *fp = fopen("/home/abdelrahman/Sources/dev/"
-                   "performance_aware_programming/data_10000000_flex.json",
-                   "rb");
+  FILE *fp = fopen("../data_10000000_flex.json", "rb");
 #endif
 
   Item *items = (Item *)malloc(ITEM_COUNT * sizeof(Item));
diff --git a/cpp/haversine.cpp b/haversine/cpp/haversine.cpp
similarity index 100%
rename from cpp/haversine.cpp
rename to haversine/cpp/haversine.cpp
diff --git a/cpp/haversine.h b/haversine/cpp/haversine.h
similarity index 100%
rename from cpp/haversine.h
rename to haversine/cpp/haversine.h
diff --git a/cpp/strtok.cpp b/haversine/cpp/strtok.cpp
similarity index 88%
rename from cpp/strtok.cpp
rename to haversine/cpp/strtok.cpp
index 831d6cf..b0fb1e0 100644
--- a/cpp/strtok.cpp
+++ b/haversine/cpp/strtok.cpp
@@ -24,13 +24,9 @@ struct Item {
 
 int main(int argc, char *argv[]) {
 #if DEBUG
-  FILE *fp = fopen("/home/abdelrahman/Sources/dev/"
-                   "performance_aware_programming/test_data.json",
-                   "rb");
+  FILE *fp = fopen("../test_data.json", "rb");
 #else
-  FILE *fp = fopen("/home/abdelrahman/Sources/dev/"
-                   "performance_aware_programming/data_10000000_flex.json",
-                   "rb");
+  FILE *fp = fopen("../data_10000000_flex.json", "rb");
 #endif
 
   Item *items = (Item *)malloc(ITEM_COUNT * sizeof(Item));
diff --git a/python/haversine_algorithm.py b/haversine/python/haversine_algorithm.py
similarity index 100%
rename from python/haversine_algorithm.py
rename to haversine/python/haversine_algorithm.py
diff --git a/python/haversine_json.py b/haversine/python/haversine_json.py
similarity index 100%
rename from python/haversine_json.py
rename to haversine/python/haversine_json.py
diff --git a/test_data.json b/haversine/test_data.json
similarity index 100%
rename from test_data.json
rename to haversine/test_data.json