Getting rid of unnecessary Create folder