Organize
Don't need to compile cli to JS first
Only require generator if needed