Updated templates.
Refactored modules.
Fixed conflicts.