Listings folder II

Continuing #1502.