Added ConnectorFactory, refactored controllers, refactores services (better delegations)