Made new release msi.  Moved code into more appropriate locations