Revert "Module management"

This reverts commit bd7172f43c530105c51aa5b064239d5da84089b6.