simplify structure, follow Connector design style. work in progress