Reorganize and add command line interface
Make a command line interface