Fix file name
Implemented -group