Get rid of redundant folder