Add Gdk/Windows and refactor a bit