Added CLI, support automatic module creation