complete task 9 + rename folder structure