[Yna2] New structure for 2D is done, Work on 3D part now