removing extraneous files, renaming to make more sense