Revert "get rid of modules again"

This reverts commit 925e37c2f23eff5b99b379dfe125763857c41cff.
Revert "get rid of modules again"

This reverts commit 925e37c2f23eff5b99b379dfe125763857c41cff.