Add Windows version. Move lin and win to separate catalogs