rebuilding with less nested folders