diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 90053af..f141277 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
         run: sudo apt-get install -y cppcheck
 
       - name: Run C++ static analysis
-        run: src/cpp/test/static_analysis.sh
+        run: src/test/static_analysis.sh
 
   cpp:
     runs-on: ubuntu-latest
@@ -24,43 +24,43 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run C++ BFS test
-        run: src/cpp/test/Search/BFS/test_bfs.sh
+        run: src/test/Search/BFS/test_bfs.sh
 
       - name: Run C++ DFS test
-        run: src/cpp/test/Search/DFS/test_dfs.sh
+        run: src/test/Search/DFS/test_dfs.sh
 
       - name: Run C++ BinarySearch test
-        run: src/cpp/test/Search/test_binary_search.sh
+        run: src/test/Search/test_binary_search.sh
 
       - name: Run C++ Knapsack test
-        run: src/cpp/test/DP/test_knapsack.sh
+        run: src/test/DP/test_knapsack.sh
 
       - name: Run C++ Dijkstra test
-        run: src/cpp/test/Graph/test_dijkstra.sh
+        run: src/test/Graph/test_dijkstra.sh
 
       - name: Run C++ Floyd test
-        run: src/cpp/test/Graph/Floyd/test_floyd.sh
+        run: src/test/Graph/Floyd/test_floyd.sh
 
       - name: Run C++ Prim test
-        run: src/cpp/test/Graph/test_prim.sh
+        run: src/test/Graph/test_prim.sh
 
       - name: Run C++ GCD test
-        run: src/cpp/test/Math/Calc/test_gcd.sh
+        run: src/test/Math/Calc/test_gcd.sh
 
       - name: Run C++ LCM test
-        run: src/cpp/test/Math/Calc/test_lcm.sh
+        run: src/test/Math/Calc/test_lcm.sh
 
       - name: Run C++ Primes test
-        run: src/cpp/test/Math/Calc/test_primes.sh
+        run: src/test/Math/Calc/test_primes.sh
 
       - name: Run C++ Combination test
-        run: src/cpp/test/Math/Combination/test_combination.sh
+        run: src/test/Math/Combination/test_combination.sh
 
       - name: Run C++ ModPow test
-        run: src/cpp/test/Math/ModPow/test_modpow.sh
+        run: src/test/Math/ModPow/test_modpow.sh
 
       - name: Run C++ SegmentTree test
-        run: src/cpp/test/Tree/SegmentTree/test_segmenttree.sh
+        run: src/test/Tree/SegmentTree/test_segmenttree.sh
 
       - name: Run C++ UnionFind test
-        run: src/cpp/test/Tree/UnionFind/test_unionfind.sh
+        run: src/test/Tree/UnionFind/test_unionfind.sh
diff --git a/README.md b/README.md
index 20c1d18..06ec0ec 100644
--- a/README.md
+++ b/README.md
@@ -25,5 +25,5 @@ C++ implementations.
 
 ```
 # C++
-src/cpp/test/<Category>/test_<name>.sh
+src/test/<Category>/test_<name>.sh
 ```
diff --git a/src/cpp/lib/DP/Knapsack.cpp b/src/lib/DP/Knapsack.cpp
similarity index 100%
rename from src/cpp/lib/DP/Knapsack.cpp
rename to src/lib/DP/Knapsack.cpp
diff --git a/src/cpp/lib/Graph/Dijkstra.cpp b/src/lib/Graph/Dijkstra.cpp
similarity index 100%
rename from src/cpp/lib/Graph/Dijkstra.cpp
rename to src/lib/Graph/Dijkstra.cpp
diff --git a/src/cpp/lib/Graph/Floyd/Floyd.cpp b/src/lib/Graph/Floyd/Floyd.cpp
similarity index 100%
rename from src/cpp/lib/Graph/Floyd/Floyd.cpp
rename to src/lib/Graph/Floyd/Floyd.cpp
diff --git a/src/cpp/lib/Graph/Prim.cpp b/src/lib/Graph/Prim.cpp
similarity index 100%
rename from src/cpp/lib/Graph/Prim.cpp
rename to src/lib/Graph/Prim.cpp
diff --git a/src/cpp/lib/Math/Calc/GCD.cpp b/src/lib/Math/Calc/GCD.cpp
similarity index 100%
rename from src/cpp/lib/Math/Calc/GCD.cpp
rename to src/lib/Math/Calc/GCD.cpp
diff --git a/src/cpp/lib/Math/Calc/LCM.cpp b/src/lib/Math/Calc/LCM.cpp
similarity index 100%
rename from src/cpp/lib/Math/Calc/LCM.cpp
rename to src/lib/Math/Calc/LCM.cpp
diff --git a/src/cpp/lib/Math/Calc/Primes.cpp b/src/lib/Math/Calc/Primes.cpp
similarity index 100%
rename from src/cpp/lib/Math/Calc/Primes.cpp
rename to src/lib/Math/Calc/Primes.cpp
diff --git a/src/cpp/lib/Math/Combination/Combination.cpp b/src/lib/Math/Combination/Combination.cpp
similarity index 100%
rename from src/cpp/lib/Math/Combination/Combination.cpp
rename to src/lib/Math/Combination/Combination.cpp
diff --git a/src/cpp/lib/Math/ModPow/ModPow.cpp b/src/lib/Math/ModPow/ModPow.cpp
similarity index 100%
rename from src/cpp/lib/Math/ModPow/ModPow.cpp
rename to src/lib/Math/ModPow/ModPow.cpp
diff --git a/src/cpp/lib/Search/BFS/BFS.cpp b/src/lib/Search/BFS/BFS.cpp
similarity index 100%
rename from src/cpp/lib/Search/BFS/BFS.cpp
rename to src/lib/Search/BFS/BFS.cpp
diff --git a/src/cpp/lib/Search/BinarySearch.cpp b/src/lib/Search/BinarySearch.cpp
similarity index 100%
rename from src/cpp/lib/Search/BinarySearch.cpp
rename to src/lib/Search/BinarySearch.cpp
diff --git a/src/cpp/lib/Search/DFS/DFS.cpp b/src/lib/Search/DFS/DFS.cpp
similarity index 100%
rename from src/cpp/lib/Search/DFS/DFS.cpp
rename to src/lib/Search/DFS/DFS.cpp
diff --git a/src/cpp/lib/Tree/SegmentTree/SegmentTree.cpp b/src/lib/Tree/SegmentTree/SegmentTree.cpp
similarity index 100%
rename from src/cpp/lib/Tree/SegmentTree/SegmentTree.cpp
rename to src/lib/Tree/SegmentTree/SegmentTree.cpp
diff --git a/src/cpp/lib/Tree/UnionFind/UnionFind.cpp b/src/lib/Tree/UnionFind/UnionFind.cpp
similarity index 100%
rename from src/cpp/lib/Tree/UnionFind/UnionFind.cpp
rename to src/lib/Tree/UnionFind/UnionFind.cpp
diff --git a/src/cpp/test/DP/test_knapsack.sh b/src/test/DP/test_knapsack.sh
similarity index 100%
rename from src/cpp/test/DP/test_knapsack.sh
rename to src/test/DP/test_knapsack.sh
diff --git a/src/cpp/test/Graph/Floyd/test_floyd.sh b/src/test/Graph/Floyd/test_floyd.sh
similarity index 100%
rename from src/cpp/test/Graph/Floyd/test_floyd.sh
rename to src/test/Graph/Floyd/test_floyd.sh
diff --git a/src/cpp/test/Graph/test_dijkstra.sh b/src/test/Graph/test_dijkstra.sh
similarity index 100%
rename from src/cpp/test/Graph/test_dijkstra.sh
rename to src/test/Graph/test_dijkstra.sh
diff --git a/src/cpp/test/Graph/test_prim.sh b/src/test/Graph/test_prim.sh
similarity index 100%
rename from src/cpp/test/Graph/test_prim.sh
rename to src/test/Graph/test_prim.sh
diff --git a/src/cpp/test/Math/Calc/test_gcd.sh b/src/test/Math/Calc/test_gcd.sh
similarity index 100%
rename from src/cpp/test/Math/Calc/test_gcd.sh
rename to src/test/Math/Calc/test_gcd.sh
diff --git a/src/cpp/test/Math/Calc/test_lcm.sh b/src/test/Math/Calc/test_lcm.sh
similarity index 100%
rename from src/cpp/test/Math/Calc/test_lcm.sh
rename to src/test/Math/Calc/test_lcm.sh
diff --git a/src/cpp/test/Math/Calc/test_primes.sh b/src/test/Math/Calc/test_primes.sh
similarity index 100%
rename from src/cpp/test/Math/Calc/test_primes.sh
rename to src/test/Math/Calc/test_primes.sh
diff --git a/src/cpp/test/Math/Combination/test_combination.sh b/src/test/Math/Combination/test_combination.sh
similarity index 100%
rename from src/cpp/test/Math/Combination/test_combination.sh
rename to src/test/Math/Combination/test_combination.sh
diff --git a/src/cpp/test/Math/ModPow/test_modpow.sh b/src/test/Math/ModPow/test_modpow.sh
similarity index 100%
rename from src/cpp/test/Math/ModPow/test_modpow.sh
rename to src/test/Math/ModPow/test_modpow.sh
diff --git a/src/cpp/test/Search/BFS/test_bfs.sh b/src/test/Search/BFS/test_bfs.sh
similarity index 100%
rename from src/cpp/test/Search/BFS/test_bfs.sh
rename to src/test/Search/BFS/test_bfs.sh
diff --git a/src/cpp/test/Search/DFS/test_dfs.sh b/src/test/Search/DFS/test_dfs.sh
similarity index 100%
rename from src/cpp/test/Search/DFS/test_dfs.sh
rename to src/test/Search/DFS/test_dfs.sh
diff --git a/src/cpp/test/Search/test_binary_search.sh b/src/test/Search/test_binary_search.sh
similarity index 100%
rename from src/cpp/test/Search/test_binary_search.sh
rename to src/test/Search/test_binary_search.sh
diff --git a/src/cpp/test/Tree/SegmentTree/test_segmenttree.sh b/src/test/Tree/SegmentTree/test_segmenttree.sh
similarity index 100%
rename from src/cpp/test/Tree/SegmentTree/test_segmenttree.sh
rename to src/test/Tree/SegmentTree/test_segmenttree.sh
diff --git a/src/cpp/test/Tree/UnionFind/test_unionfind.sh b/src/test/Tree/UnionFind/test_unionfind.sh
similarity index 100%
rename from src/cpp/test/Tree/UnionFind/test_unionfind.sh
rename to src/test/Tree/UnionFind/test_unionfind.sh
diff --git a/src/cpp/test/static_analysis.sh b/src/test/static_analysis.sh
similarity index 100%
rename from src/cpp/test/static_analysis.sh
rename to src/test/static_analysis.sh