Squashed commit of the following:

commit b13131578a33c7018a06045e3c3048995aabb3f3
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 19:01:47 2018 +0000

    Move lib files to correct place

commit 0b9c323f97f4c87bb2801d1722aa9da230ec8be6
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 18:50:58 2018 +0000

    Fix command name

commit 4c1bc966a35e854026900c88044a4e8d50e88a7a
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 18:49:03 2018 +0000

    Fix directories in zip

commit 5fd2ffe84f8f86c903c9e93dc10d6eb35362529b
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 18:33:51 2018 +0000

    Correct 7z command

commit a53e01fd44c7e657e06a4a3f928bb444e2b11110
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 18:27:37 2018 +0000

    Add notices, licenses to zip

commit 6e4bf4efaafd89cce5bae46962e658d17277dbbe
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 17:53:50 2018 +0000

    Separate 7z commands

commit 0010f6773d5b3ba0bcfeec143927c2ce013661f2
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 17:52:17 2018 +0000

    3

commit c9755e262173d4216342b038cd841bf87d9243dc
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 17:49:56 2018 +0000

    Attempt 2

appveyor.yml

@@ -19,22 +19,54 @@ install:
 build_script:
 - cmd: >-
     mkdir build.paho
+
     cd build.paho
+
     echo %APPVEYOR_BUILD_WORKER_IMAGE%
+
     if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
+
     if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
+
     cmake -G "NMake Makefiles" -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ..
+
     nmake
-    ctest -T test -VV
+
+    REM ctest -T test -VV
+
     cd ..
 
 after_build:
 - cmd: >-
     set ZIPNAME=eclipse-paho-mqtt-c-windows.zip 
-    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\build.paho\src\*.dll
-    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\build.paho\src\*.lib
-    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\build.paho\src\*.exe -r
-    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\src\MQTTClient.h %APPVEYOR_BUILD_FOLDER%\src\MQTTAsync.h
+
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\*.html
+
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\*.md
+
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\*-v10
+
+    7z a %ZIPNAME% build.paho\src\*.dll
+
+    7z a %ZIPNAME% build.paho\src\*.lib
+
+    7z rn %ZIPNAME% build.paho\src lib
+
+    7z a %ZIPNAME% build.paho\src\samples\*.exe
+
+    7z rn %ZIPNAME% build.paho\src\samples bin
+
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\build.paho\src\MQTTVersion.exe
+
+    7z rn %ZIPNAME% MQTTVersion.exe bin\MQTTVersion.exe
+
+    7z a %ZIPNAME% src\MQTTClient.h src\MQTTAsync.h src\MQTTClientPersistence.h
+
+    7z rn %ZIPNAME% src include
+
+    7z a %ZIPNAME% src\samples\*.c
+
+    7z rn %ZIPNAME% src\samples samples
 
 artifacts:
 - path: eclipse-paho-mqtt-c-windows.zip