Redesigned group files (commit to get successfull tests).