diff --git a/src/SymbolicIntegration.jl b/src/SymbolicIntegration.jl
index 9663f75..9e94002 100644
--- a/src/SymbolicIntegration.jl
+++ b/src/SymbolicIntegration.jl
@@ -2,15 +2,16 @@ __precompile__()
 
 module SymbolicIntegration
 
-include("general.jl")
-include("rational_functions.jl")
-include("differential_fields.jl")
-include("complex_fields.jl")
-include("transcendental_functions.jl")
-include("risch_diffeq.jl")
-include("parametric_problems.jl")
-include("coupled_differential_systems.jl")
-include("algebraic_functions.jl")
+# Include Risch method algorithm components
+include("methods/risch/general.jl")
+include("methods/risch/rational_functions.jl")
+include("methods/risch/differential_fields.jl")
+include("methods/risch/complex_fields.jl")
+include("methods/risch/transcendental_functions.jl")
+include("methods/risch/risch_diffeq.jl")
+include("methods/risch/parametric_problems.jl")
+include("methods/risch/coupled_differential_systems.jl")
+include("methods/risch/algebraic_functions.jl")
 include("frontend.jl")
 
 # Add method dispatch system
diff --git a/src/algebraic_functions.jl b/src/methods/risch/algebraic_functions.jl
similarity index 100%
rename from src/algebraic_functions.jl
rename to src/methods/risch/algebraic_functions.jl
diff --git a/src/complex_fields.jl b/src/methods/risch/complex_fields.jl
similarity index 100%
rename from src/complex_fields.jl
rename to src/methods/risch/complex_fields.jl
diff --git a/src/coupled_differential_systems.jl b/src/methods/risch/coupled_differential_systems.jl
similarity index 100%
rename from src/coupled_differential_systems.jl
rename to src/methods/risch/coupled_differential_systems.jl
diff --git a/src/differential_fields.jl b/src/methods/risch/differential_fields.jl
similarity index 100%
rename from src/differential_fields.jl
rename to src/methods/risch/differential_fields.jl
diff --git a/src/general.jl b/src/methods/risch/general.jl
similarity index 100%
rename from src/general.jl
rename to src/methods/risch/general.jl
diff --git a/src/parametric_problems.jl b/src/methods/risch/parametric_problems.jl
similarity index 100%
rename from src/parametric_problems.jl
rename to src/methods/risch/parametric_problems.jl
diff --git a/src/rational_functions.jl b/src/methods/risch/rational_functions.jl
similarity index 100%
rename from src/rational_functions.jl
rename to src/methods/risch/rational_functions.jl
diff --git a/src/risch_diffeq.jl b/src/methods/risch/risch_diffeq.jl
similarity index 100%
rename from src/risch_diffeq.jl
rename to src/methods/risch/risch_diffeq.jl
diff --git a/src/transcendental_functions.jl b/src/methods/risch/transcendental_functions.jl
similarity index 100%
rename from src/transcendental_functions.jl
rename to src/methods/risch/transcendental_functions.jl
diff --git a/test/bronstein_examples.jl b/test/methods/risch/bronstein_examples.jl
similarity index 100%
rename from test/bronstein_examples.jl
rename to test/methods/risch/bronstein_examples.jl
diff --git a/test/test_algorithm_internals.jl b/test/methods/risch/test_algorithm_internals.jl
similarity index 100%
rename from test/test_algorithm_internals.jl
rename to test/methods/risch/test_algorithm_internals.jl
diff --git a/test/test_bronstein_examples.jl b/test/methods/risch/test_bronstein_examples.jl
similarity index 100%
rename from test/test_bronstein_examples.jl
rename to test/methods/risch/test_bronstein_examples.jl
diff --git a/test/test_complex_fields.jl b/test/methods/risch/test_complex_fields.jl
similarity index 100%
rename from test/test_complex_fields.jl
rename to test/methods/risch/test_complex_fields.jl
diff --git a/test/test_integrate_rational.jl b/test/methods/risch/test_integrate_rational.jl
similarity index 100%
rename from test/test_integrate_rational.jl
rename to test/methods/risch/test_integrate_rational.jl
diff --git a/test/test_rational_integration.jl b/test/methods/risch/test_rational_integration.jl
similarity index 100%
rename from test/test_rational_integration.jl
rename to test/methods/risch/test_rational_integration.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index c9e4b13..c404f08 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -31,10 +31,12 @@ using Symbolics
         @test integrate(x^3 + 2*x + 1, x) isa Any
     end
     
-    # Include comprehensive test suites
-    include("test_rational_integration.jl")
-    include("test_complex_fields.jl") 
-    include("test_bronstein_examples.jl")
+    # Include Risch method test suites
+    include("methods/risch/test_rational_integration.jl")
+    include("methods/risch/test_complex_fields.jl") 
+    include("methods/risch/test_bronstein_examples.jl")
+    include("methods/risch/test_algorithm_internals.jl")
+    
+    # Include general test suites
     include("test_stewart_examples.jl")
-    include("test_algorithm_internals.jl")
 end
\ No newline at end of file