Module scaffolding template clean up

- Cleaned up module scaffolding template and it's functions.