Removed group file
Changes in code structure