Make our code more modular
Revert "Make our code more modular"

This reverts commit bf0b79d4779aed5d0eded7e3315555d1cdaf69f0.