some module scaffolding
Merge branch 'master' into custom_types_and_providers