Improved clippings directory layout.