Drop down a directory level

Former-commit-id: 1b7f85028391dcccf5a269d1f8a48ecc20ebe929