Fixing duplicated folders