removing one level of folder indirection