Fix up modules to use new system
Merge branch 'master' of https://github.com/skipperguy12/TestHungerGames