deleted junk and renamed stuff