Listings folder (2)

Continuing #1502.