ISSUE-1 reorganize agents #1