better TabComplete organization