Added Connector classes and modified structure