Begin Cascade Refactor
Broke apart modules for cascade