Reorganize package, move goal to each agent package