New setup structure and CLI update.