Re-added gfx/ and web/