Use xorg folder structure

Change-Id: Ib361e9be0669a7bfc789159380f16d771cf2d382