added group by
Modified structure of directory