Renaming; moving; adding one more dict