Added module generator
Fixed components generator