Reorganize. Add goss and gosh commands.