Updates structure to use command line tool