removed redundancy in folder names