Organize include groups