Fix compilation for windows
removed z_framework, changing it to submodule instead
Change framework to use submodule instead
merge window code