Fixed module generation and scripts import