The invention relates to an optical connector assembly for optically connecting to a waveguide structure in a x-y plane of a layer stack, wherein the connector assembly comprises a coupling device providing a first optical path, and the waveguide structure provides a second optical path, deflecting from said first optical path. The coupling device comprises first reference means adapted to co-operate with second reference means in the layer stack, wherein the second reference means are adapted for aligning the coupling device to the waveguide structure in both the x- and y-direction of the x-y plane as to optically couple the first and second optical path. As a result an optical connector assembly is provided that improves the optical coupling between the optical path in a waveguide structure and in a coupling device and/or a mating optical device. The coupling device may comprise third reference means to couple an optical connector to the waveguide structure. The invention also relates to a method for aligning the coupling device and the waveguide structure.