Added a generator
Fixed module naming