Get rid of extra folders for elements