Remove extra layer of folders