Remove extra folder level