diff --git a/src/pathways.jl b/src/pathways.jl
index 500a8a98c633a820b2f01b15865342ddb73a61cb..2bc79af03152f4a7d04db74b1f85ddbfb9752511 100644
--- a/src/pathways.jl
+++ b/src/pathways.jl
@@ -1,12 +1,10 @@
 module Pathways
 import LinearAlgebra: norm, tr
 import StaticArrays: SVector, SMatrix
-import ..BuildingBlocks: BuildingBlock, GradientBlock, RFPulseBlock, ContainerBlock, get_children_indices
-import ..Sequences: Sequence
+import ..Components: NoGradient, ConstantGradient, ChangingGradient, RFPulseComponent, ReadoutComponent, InstantGradient
+import ..AllSequences: BaseSequence
+import ..AllBuildingBlocks: BaseBuildingBlock, waveform, events, get_parts
 import ..Variables: qvec, qval, bmat_gradient, VariableType, start_time, effective_time, duration, qval_square
-import ..Wait: WaitBlock
-import ..Readouts: InstantReadout, ADC
-import ..Overlapping: AbstractOverlapping, interruptions, waveform, get_parts
 import ..Alternatives: AlternativeBlocks