diff --git a/GPy/inference/ep.py b/GPy/inference/latent_function_inference/ep.py
similarity index 100%
rename from GPy/inference/ep.py
rename to GPy/inference/latent_function_inference/ep.py
diff --git a/GPy/inference/laplace.py b/GPy/inference/latent_function_inference/laplace.py
similarity index 100%
rename from GPy/inference/laplace.py
rename to GPy/inference/latent_function_inference/laplace.py
diff --git a/GPy/inference/__init__.py b/GPy/inference/optimization/__init__.py
similarity index 100%
rename from GPy/inference/__init__.py
rename to GPy/inference/optimization/__init__.py
diff --git a/GPy/inference/conjugate_gradient_descent.py b/GPy/inference/optimization/conjugate_gradient_descent.py
similarity index 100%
rename from GPy/inference/conjugate_gradient_descent.py
rename to GPy/inference/optimization/conjugate_gradient_descent.py
diff --git a/GPy/inference/gradient_descent_update_rules.py b/GPy/inference/optimization/gradient_descent_update_rules.py
similarity index 100%
rename from GPy/inference/gradient_descent_update_rules.py
rename to GPy/inference/optimization/gradient_descent_update_rules.py
diff --git a/GPy/inference/optimization.py b/GPy/inference/optimization/optimization.py
similarity index 100%
rename from GPy/inference/optimization.py
rename to GPy/inference/optimization/optimization.py
diff --git a/GPy/inference/samplers.py b/GPy/inference/optimization/samplers.py
similarity index 100%
rename from GPy/inference/samplers.py
rename to GPy/inference/optimization/samplers.py
diff --git a/GPy/inference/scg.py b/GPy/inference/optimization/scg.py
similarity index 100%
rename from GPy/inference/scg.py
rename to GPy/inference/optimization/scg.py
diff --git a/GPy/inference/sgd.py b/GPy/inference/optimization/sgd.py
similarity index 100%
rename from GPy/inference/sgd.py
rename to GPy/inference/optimization/sgd.py