[OE-4203] Split eyedraw and eyedraw fields into seperate files to be consistent