Refactor for scaffolding different module types
Update docs according to new design