diff --git a/CASA/Makefile.am b/CASA/Makefile.am
index ca4a9fc8..ceff84ee 100644
--- a/CASA/Makefile.am
+++ b/CASA/Makefile.am
@@ -34,7 +34,7 @@ DIST_SUBDIRS = micasacache common micasadk micasad sharp  \
 endif
 
 if WINDOWS
-SUBDIRS = micasacache common micasadk jwrapper  package 
+SUBDIRS = package 
 DIST_SUBDIRS = micasacache common micasadk jwrapper  package
 endif
 
diff --git a/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am b/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
index c2b4200b..378373a6 100644
--- a/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
+++ b/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
@@ -71,11 +71,10 @@ $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv
 	"$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msi $(MSIFILE) version=$(VERSION) 
 	@echo [======== Building Solution $(SFILES) ========]
 	"$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log 
-	cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(CASABINDIR) 
-	cp -f $(TARGET_CFG)/setup.* $(CASABINDIR) 
-	[ -d BUILT ] | mkdir -p BUILT
-	cp -p $(CASABINDIR)/setup.* BUILT
-	cp -p $(CASABINDIR)/CASA.msi BUILT
+	cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) ../BUILT/bin64 
+	cp -f $(TARGET_CFG)/setup.exe ../BUILT/bin64 
+	cp -p ../CASA32-msi/$(TARGET_CFG)/setup.exe ../BUILT/bin
+	cp -p ../CASA32-msi/$(TARGET_CFG)/CASA.msi ../BUILT/bin
 	tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT
 	bzip2 -z $(PACKAGE)-$(VERSION).tar
 
@@ -86,6 +85,9 @@ devenv:
 $(OBJDIR):
 	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
 	[ -d $(CASABINDIR) ] || mkdir -p $(CASABINDIR)
+	[ -d ../BUILT ] || mkdir -p ../BUILT 
+	[ -d ../BUILT ] || mkdir -p ../BUILT/bin64 
+	[ -d ../BUILT ] || mkdir -p ../BUILT/bin 
 
 
 install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
@@ -107,7 +109,7 @@ clean-local:
 	if [ -d $(TARGET_CFG) ]; then  rm -rf $(TARGET_CFG); fi
 	if [ -d Debug ]; then  rm -rf Debug; fi
 	if [ -f build.log ]; then  rm -f build.log; fi
-	if [ -d BUILT ]; then rm -rf BUILT; fi
+	if [ -d ../BUILT ]; then rm -rf ../BUILT; fi
 	if [ -f $(PACKAGE)-$(VERSION).tar.bz2 ]; then rm -f $(PACKAGE)-$(VERSION).tar.bz2; fi
 distclean-local: