database restructure and most groups