Revert "Revert "Merge pull request #836 from jet47:gpu-modules""