Structural change in retrieval and swarm_controller

Small structural change to better reflect the subsumtion architecture.
No biggie.