Slightly better directory layout.