Removed and renamed stuff on res/.