Module architecture

- Module supporting
- Syntax correction
- Some code optimisation