Restructured gvm module
Merge https://github.com/dmwilliamstech/gvm_module