Revert "Remove modules"

This reverts commit 1d11b9ae989b2e4fdfbc6ca1e43f0ffbed455734.
Fix