Refactor Director
Refactor a lot. New API for Connector