Improves/extended group functionality and deleted some unused files