package structure added
GroupFinder is not working yet