Fixed an integration issue with module naming.
Fixed more integration issues.
Merge branch 'user/LoganEvans-structure' into dev-integration
grapevine now caches the last message.