Added windows modules to master