reorganized command invocations from dsls