diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbfb3fc..ffc290a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,20 +5,32 @@ set(CMAKE_CXX_STANDARD 23)
 
 include_directories(.)
 
-file(GLOB VERIFY_SOURCES verify/*.test.cpp)
+file(GLOB VERIFY_SOURCES
+    datastructure/*.test.cpp
+    geometry/*.test.cpp
+    graph/*.test.cpp
+    math/*.test.cpp
+    string/*.test.cpp
+    misc/*.test.cpp
+)
 file(GLOB VERIFY_SRC_SOURCES verify/src/*.cpp)
 
 add_compile_options(-Wall -Wno-deprecated -Wno-cpp)
 
 foreach(src ${VERIFY_SOURCES} ${VERIFY_SRC_SOURCES})
-    get_filename_component(name ${src} NAME_WE)
+    get_filename_component(name ${src} NAME_WLE)
     add_executable(${name} ${src})
 endforeach()
 
 # --- Lint targets ---
 file(GLOB_RECURSE ALL_SOURCES
-    datastructure/*.hpp graph/*.hpp math/*.hpp geometry/*.hpp string/*.hpp misc/*.hpp
-    verify/*.cpp verify/src/*.cpp
+    datastructure/*.hpp datastructure/*.test.cpp
+    graph/*.hpp graph/*.test.cpp
+    math/*.hpp math/*.test.cpp
+    geometry/*.hpp geometry/*.test.cpp
+    string/*.hpp string/*.test.cpp
+    misc/*.hpp misc/*.test.cpp
+    verify/src/*.cpp
 )
 
 find_program(CLANG_FORMAT clang-format)
diff --git a/verify/DSL_2_B.test.cpp b/datastructure/fenwick.dsl_2_b.test.cpp
similarity index 100%
rename from verify/DSL_2_B.test.cpp
rename to datastructure/fenwick.dsl_2_b.test.cpp
diff --git a/verify/aoj1351.test.cpp b/datastructure/lazysegtree.aoj1351.test.cpp
similarity index 100%
rename from verify/aoj1351.test.cpp
rename to datastructure/lazysegtree.aoj1351.test.cpp
diff --git a/verify/DSL_2_A.test.cpp b/datastructure/segmenttree.dsl_2_a.test.cpp
similarity index 100%
rename from verify/DSL_2_A.test.cpp
rename to datastructure/segmenttree.dsl_2_a.test.cpp
diff --git a/verify/aoj1279.test.cpp b/geometry/arrangement.aoj1279.test.cpp
similarity index 100%
rename from verify/aoj1279.test.cpp
rename to geometry/arrangement.aoj1279.test.cpp
diff --git a/verify/aoj2448.test.cpp b/geometry/arrangement.aoj2448.test.cpp
similarity index 100%
rename from verify/aoj2448.test.cpp
rename to geometry/arrangement.aoj2448.test.cpp
diff --git a/verify/CGL_5_A.test.cpp b/geometry/closestpair.cgl_5_a.test.cpp
similarity index 100%
rename from verify/CGL_5_A.test.cpp
rename to geometry/closestpair.cgl_5_a.test.cpp
diff --git a/verify/CGL_4_C.test.cpp b/geometry/convexcut.cgl_4_c.test.cpp
similarity index 100%
rename from verify/CGL_4_C.test.cpp
rename to geometry/convexcut.cgl_4_c.test.cpp
diff --git a/verify/CGL_4_A.test.cpp b/geometry/convexhull.cgl_4_a.test.cpp
similarity index 100%
rename from verify/CGL_4_A.test.cpp
rename to geometry/convexhull.cgl_4_a.test.cpp
diff --git a/verify/aoj2402.test.cpp b/geometry/crosspoint.aoj2402.test.cpp
similarity index 100%
rename from verify/aoj2402.test.cpp
rename to geometry/crosspoint.aoj2402.test.cpp
diff --git a/verify/CGL_2_B.test.cpp b/geometry/crosspoint.cgl_2_b.test.cpp
similarity index 100%
rename from verify/CGL_2_B.test.cpp
rename to geometry/crosspoint.cgl_2_b.test.cpp
diff --git a/verify/CGL_2_C.test.cpp b/geometry/crosspoint.cgl_2_c.test.cpp
similarity index 100%
rename from verify/CGL_2_C.test.cpp
rename to geometry/crosspoint.cgl_2_c.test.cpp
diff --git a/verify/CGL_2_D.test.cpp b/geometry/crosspoint.cgl_2_d.test.cpp
similarity index 100%
rename from verify/CGL_2_D.test.cpp
rename to geometry/crosspoint.cgl_2_d.test.cpp
diff --git a/verify/CGL_7_D.test.cpp b/geometry/crosspoint.cgl_7_d.test.cpp
similarity index 100%
rename from verify/CGL_7_D.test.cpp
rename to geometry/crosspoint.cgl_7_d.test.cpp
diff --git a/verify/CGL_7_E.test.cpp b/geometry/crosspoint.cgl_7_e.test.cpp
similarity index 100%
rename from verify/CGL_7_E.test.cpp
rename to geometry/crosspoint.cgl_7_e.test.cpp
diff --git a/verify/CGL_1_A.test.cpp b/geometry/geometry.cgl_1_a.test.cpp
similarity index 100%
rename from verify/CGL_1_A.test.cpp
rename to geometry/geometry.cgl_1_a.test.cpp
diff --git a/verify/CGL_1_B.test.cpp b/geometry/geometry.cgl_1_b.test.cpp
similarity index 100%
rename from verify/CGL_1_B.test.cpp
rename to geometry/geometry.cgl_1_b.test.cpp
diff --git a/verify/CGL_1_C.test.cpp b/geometry/geometry.cgl_1_c.test.cpp
similarity index 100%
rename from verify/CGL_1_C.test.cpp
rename to geometry/geometry.cgl_1_c.test.cpp
diff --git a/verify/CGL_2_A.test.cpp b/geometry/geometry.cgl_2_a.test.cpp
similarity index 100%
rename from verify/CGL_2_A.test.cpp
rename to geometry/geometry.cgl_2_a.test.cpp
diff --git a/verify/CGL_3_A.test.cpp b/geometry/polygon.cgl_3_a.test.cpp
similarity index 100%
rename from verify/CGL_3_A.test.cpp
rename to geometry/polygon.cgl_3_a.test.cpp
index 9e04e36..9847b4d 100644
--- a/verify/CGL_3_A.test.cpp
+++ b/geometry/polygon.cgl_3_a.test.cpp
@@ -1,6 +1,6 @@
 #define PROBLEM "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=CGL_3_A"
-#include "geometry/geometry.hpp"
 #include "geometry/polygon.hpp"
+#include "geometry/geometry.hpp"
 #include "misc/template.hpp"
 
 int main() {
diff --git a/verify/CGL_3_B.test.cpp b/geometry/polygon.cgl_3_b.test.cpp
similarity index 100%
rename from verify/CGL_3_B.test.cpp
rename to geometry/polygon.cgl_3_b.test.cpp
index 6415f11..7645101 100644
--- a/verify/CGL_3_B.test.cpp
+++ b/geometry/polygon.cgl_3_b.test.cpp
@@ -1,6 +1,6 @@
 #define PROBLEM "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=CGL_3_B"
-#include "geometry/geometry.hpp"
 #include "geometry/polygon.hpp"
+#include "geometry/geometry.hpp"
 #include "misc/template.hpp"
 
 int main() {
diff --git a/verify/CGL_3_C.test.cpp b/geometry/polygon.cgl_3_c.test.cpp
similarity index 100%
rename from verify/CGL_3_C.test.cpp
rename to geometry/polygon.cgl_3_c.test.cpp
index 556e482..483bc93 100644
--- a/verify/CGL_3_C.test.cpp
+++ b/geometry/polygon.cgl_3_c.test.cpp
@@ -1,6 +1,6 @@
 #define PROBLEM "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=CGL_3_C"
-#include "geometry/geometry.hpp"
 #include "geometry/polygon.hpp"
+#include "geometry/geometry.hpp"
 #include "misc/template.hpp"
 
 int main() {
diff --git a/verify/CGL_7_A.test.cpp b/geometry/tangent.cgl_7_a.test.cpp
similarity index 100%
rename from verify/CGL_7_A.test.cpp
rename to geometry/tangent.cgl_7_a.test.cpp
index 18681cb..ea2a62a 100644
--- a/verify/CGL_7_A.test.cpp
+++ b/geometry/tangent.cgl_7_a.test.cpp
@@ -1,6 +1,6 @@
 #define PROBLEM "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=CGL_7_A"
-#include "geometry/geometry.hpp"
 #include "geometry/tangent.hpp"
+#include "geometry/geometry.hpp"
 #include "misc/template.hpp"
 
 int main() {
diff --git a/verify/CGL_7_G.test.cpp b/geometry/tangent.cgl_7_g.test.cpp
similarity index 100%
rename from verify/CGL_7_G.test.cpp
rename to geometry/tangent.cgl_7_g.test.cpp
index e7d9063..45f47ef 100644
--- a/verify/CGL_7_G.test.cpp
+++ b/geometry/tangent.cgl_7_g.test.cpp
@@ -1,7 +1,7 @@
 #define PROBLEM "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=CGL_7_G"
 #define ERROR 1e-8
-#include "geometry/geometry.hpp"
 #include "geometry/tangent.hpp"
+#include "geometry/geometry.hpp"
 #include "misc/template.hpp"
 
 int main() {
diff --git a/verify/GRL_3_A.test.cpp b/graph/articulation.grl_3_a.test.cpp
similarity index 100%
rename from verify/GRL_3_A.test.cpp
rename to graph/articulation.grl_3_a.test.cpp
diff --git a/verify/GRL_1_B.test.cpp b/graph/bellman.grl_1_b.test.cpp
similarity index 100%
rename from verify/GRL_1_B.test.cpp
rename to graph/bellman.grl_1_b.test.cpp
diff --git a/verify/GRL_3_B.test.cpp b/graph/bridge.grl_3_b.test.cpp
similarity index 100%
rename from verify/GRL_3_B.test.cpp
rename to graph/bridge.grl_3_b.test.cpp
diff --git a/verify/GRL_1_A.test.cpp b/graph/dijkstra.grl_1_a.test.cpp
similarity index 100%
rename from verify/GRL_1_A.test.cpp
rename to graph/dijkstra.grl_1_a.test.cpp
diff --git a/verify/GRL_2_A.test.cpp b/graph/kruskal.grl_2_a.test.cpp
similarity index 100%
rename from verify/GRL_2_A.test.cpp
rename to graph/kruskal.grl_2_a.test.cpp
index be364c8..35c3ae9 100644
--- a/verify/GRL_2_A.test.cpp
+++ b/graph/kruskal.grl_2_a.test.cpp
@@ -1,7 +1,7 @@
 #define PROBLEM "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=GRL_2_A"
+#include "graph/kruskal.hpp"
 #include "datastructure/unionfind.hpp"
 #include "graph/graph.hpp"
-#include "graph/kruskal.hpp"
 #include "misc/template.hpp"
 
 int main() {
diff --git a/verify/GRL_5_C.test.cpp b/graph/lca.grl_5_c.test.cpp
similarity index 100%
rename from verify/GRL_5_C.test.cpp
rename to graph/lca.grl_5_c.test.cpp
diff --git a/verify/GRL_3_C.test.cpp b/graph/scc.grl_3_c.test.cpp
similarity index 100%
rename from verify/GRL_3_C.test.cpp
rename to graph/scc.grl_3_c.test.cpp
index 0433476..61be217 100644
--- a/verify/GRL_3_C.test.cpp
+++ b/graph/scc.grl_3_c.test.cpp
@@ -1,6 +1,6 @@
 #define PROBLEM "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=GRL_3_C"
-#include "graph/graph.hpp"
 #include "graph/scc.hpp"
+#include "graph/graph.hpp"
 #include "misc/template.hpp"
 
 int main() {
diff --git a/verify/GRL_4_B.test.cpp b/graph/topologicalsort.grl_4_b.test.cpp
similarity index 100%
rename from verify/GRL_4_B.test.cpp
rename to graph/topologicalsort.grl_4_b.test.cpp
index 6eb6d9d..a116b8e 100644
--- a/verify/GRL_4_B.test.cpp
+++ b/graph/topologicalsort.grl_4_b.test.cpp
@@ -1,6 +1,6 @@
 #define PROBLEM "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=GRL_4_B"
-#include "graph/graph.hpp"
 #include "graph/topologicalsort.hpp"
+#include "graph/graph.hpp"
 #include "misc/template.hpp"
 
 int main() {