Updates folder structure and removes duplication