Refactoring window/ into gfx/