Remove folder duplication