Moving more stuff into dedicated win32