Feature/remove gfx namespace