Package structure: Change to gID, from gID+aID