diff --git a/src/BetaSchedules/BetaSchedules.jl b/src/BetaSchedules/BetaSchedules.jl
index 976f21d..ce953a7 100644
--- a/src/BetaSchedules/BetaSchedules.jl
+++ b/src/BetaSchedules/BetaSchedules.jl
@@ -6,16 +6,17 @@ include("ScaledLinear.jl")
 include("Cosine.jl")
 include("Sigmoid.jl")
 
-export
-  linear_beta_schedule,
-  scaled_linear_beta_schedule,
-  cosine_beta_schedule,
-  sigmoid_beta_schedule
-
 # utils
 include("ZeroSNR.jl")
 
 export
+  # Beta Schedules
+  linear_beta_schedule,
+  scaled_linear_beta_schedule,
+  cosine_beta_schedule,
+  sigmoid_beta_schedule,
+
+  # Beta Schedule utils
   rescale_zero_terminal_snr
 
 end # module BetaSchedules
diff --git a/src/Diffusers.jl b/src/Diffusers.jl
index eeb80a2..13961a0 100644
--- a/src/Diffusers.jl
+++ b/src/Diffusers.jl
@@ -1,6 +1,43 @@
 module Diffusers
 
 include("BetaSchedules/BetaSchedules.jl")
+
+import .BetaSchedules:
+  # Beta Schedules
+  linear_beta_schedule,
+  scaled_linear_beta_schedule,
+  cosine_beta_schedule,
+  sigmoid_beta_schedule,
+
+  # Beta Schedule utils
+  rescale_zero_terminal_snr
+
+export
+  # Beta Schedules
+  linear_beta_schedule,
+  scaled_linear_beta_schedule,
+  cosine_beta_schedule,
+  sigmoid_beta_schedule,
+
+  # Beta Schedule utils
+  rescale_zero_terminal_snr
+
 include("Schedulers/Schedulers.jl")
 
+import .Schedulers:
+  # Scheduler
+  DDPM,
+
+  # Scheduler methods
+  add_noise,
+  step
+
+export
+  # Scheduler
+  DDPM,
+
+  # Scheduler methods
+  add_noise,
+  step
+
 end # module Diffusers
diff --git a/src/Schedulers/Schedulers.jl b/src/Schedulers/Schedulers.jl
index f765611..cd4fc88 100644
--- a/src/Schedulers/Schedulers.jl
+++ b/src/Schedulers/Schedulers.jl
@@ -2,8 +2,12 @@ module Schedulers
 
 include("DDPM.jl")
 
-export DDPM
+export
+  # Schedulers
+  DDPM,
 
-export add_noise, step
+  # Scheduler methods
+  add_noise,
+  step
 
 end # module Schedulers