Remove folder redundancy