Changed the naming of files and some default options.