removed extraneous files, renaming