Grouped files

Signed-off-by: likoms1 <toribosh@gmail.com>