Revert "Remove Modules (Subtree Instead)"

This reverts commit 56364311bfd1792d2547da107698702e43e2b571.